Merge branch 'release/1.2.19'

Author: Gipetto

CHANGELOG.markdown

@@ -1,5 +1,15 @@
 # OpenVBX Change Log
 
+## OpenVBX 1.2.19
+
+- Fix highlighting of plugin generated pages in sidebar menu. (Thanks @jpwalters)
+- Allow Administrator users to "promote" other users to Administrator. (Thanks @jpwalters)
+- Allow conferences to be recorded. (Thanks @jpwalters)
+- Add programmatic underpinnings to allow for easy recording of dialed calls. (Thanks @jpwalters)
+- Doc updates to assist static analysis tools.
+- Load Twilio JS via protocol relative url. (Thanks @trenton42)
+
+
 ## OpenVBX 1.2.18
 
 - Fix implementation of several methods by making them static.

OpenVBX/config/version.php

@@ -1,3 +1,3 @@
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-$config['version'] = '1.2.18';
+$config['version'] = '1.2.19';

OpenVBX/controllers/account.php

@@ -35,6 +35,7 @@ class Account extends User_Controller {
 	private $editable_fields = array('first_name',
 									 'last_name',
 									 'email',
+									 'is_admin',
 									 'pin',
 									 'notification');
 	protected $user_id;
@@ -140,9 +141,16 @@ public function edit($user_id = null)
 			$val = $this->input->post($field);
 			if (in_array($field, $user->admin_fields))
 			{
-				if (($val || $val === '0') && $is_admin)
+				if($user->id != $this->session->userdata('user_id') && $is_admin)
 				{
-					$user->$field = $val;
+					if (($val || $val === '0'))
+					{
+						$user->$field = $val;
+					}
+					else
+					{
+						$user->$field = '0';
+					}
 				}
 			}
 			else

OpenVBX/controllers/accounts.php

@@ -19,6 +19,12 @@
  * Contributor(s):
  **/
 
+/**
+ * Class Accounts
+ * @property VBX_User $vbx_user
+ * @property VBX_Group $vbx_group
+ * @property VBX_Device $vbx_device
+ */
 class Accounts extends User_Controller {
 
 	function __construct()

OpenVBX/controllers/client.php

@@ -20,8 +20,10 @@
  **/
 
 class ClientException extends Exception {}
-/*
- Client handles all public access information for determining version, theming, i18n.
+
+/**
+ * Client handles all public access information for determining version, theming, i18n.
+ * @property VBX_Theme $vbx_theme
 */
 class Client extends MY_Controller
 {

OpenVBX/controllers/flows.php

@@ -21,6 +21,10 @@
 
 require_once(APPPATH.'libraries/twilio.php');
 
+/**
+ * Class Flows
+ * @property MY_Pagination $pagination
+ */
 class Flows extends User_Controller {
 
 	private $flows_per_page = '50';

OpenVBX/controllers/iframe.php

@@ -29,8 +29,7 @@ class Iframe extends User_Controller {
 	function index() {
 		$data = $this->init_view_data();
 
-		$twilio_js = sprintf('%s://static.twilio.com/libs/twiliojs/%s/twilio%s.js', 
-			'http'.(is_ssl() ? 's' : ''),
+		$twilio_js = sprintf('//static.twilio.com/libs/twiliojs/%s/twilio%s.js', 
 			$this->twilio_js_version,
 			($this->config->item('use_unminimized_js') ? '' : '.min')
 		);

OpenVBX/controllers/install.php

@@ -21,16 +21,29 @@
 
 class InstallException extends Exception {}
 
+/**
+ * Class Install
+ * @property CI_Loader $load
+ * @property CI_Config $config
+ * @property CI_Input $input
+ */
 class Install extends Controller {
 
 	public $tenant;
 
 	public $tests;
 	public $pass;
-	
+
+	protected $user = array();
+	protected $database = array();
+	protected $openvbx_settings = array();
+	protected $openvbx = array();
+
 	private $account;
 	protected $min_php_version = MIN_PHP_VERSION;
 
+	protected $cache;
+
 	public function __construct()
 	{
 		parent::Controller();

OpenVBX/controllers/iphone.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * Class iPhone
+ * @property VBX_Message $vbx_message
+ */
 class iPhone extends MY_Controller {
 
 	public function install() {

OpenVBX/controllers/messages/details.php

@@ -23,6 +23,10 @@
 
 class DetailsException extends Exception {}
 
+/**
+ * Class Details
+ * @property VBX_Call $vbx_call
+ */
 class Details extends User_Controller
 {
 	const PAGE_SIZE = 20;