build v3.1.0

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## 3.1.0 - 2017-02-14
 ### Added
 - add option to use user email as jid
 - add option to add external services
@@ -18,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - fix user setting retrieval
 
 ### Changed
-- upgrade jsxc to v3.1.0
+- upgrade jsxc to v3.1.0 ([change log](https://github.com/jsxc/jsxc/blob/master/CHANGELOG.md))
 - change category to social
 - minor settings redesign
 - use nc colors

appinfo/info.xml

@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.1.0-beta.2</version>
+   <version>3.1.0</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

build/ajax/getSettings.php

@@ -9,20 +9,23 @@ function validateBoolean($val)
 
 OCP\JSON::callCheck();
 
-$username = $_POST ['username'];
-$password = $_POST ['password'];
+$currentUser = false;
 
-$ocUser = new OCP\User();
-
-$auth = ($password !== null) ? $ocUser->checkPassword($username, $password) : OCP\User::isLoggedIn();
+if(!empty($_POST['password']) && !empty($_POST['username'])) {
+   $currentUser = \OC::$server->getUserManager()->checkPassword($_POST['username'], $_POST['password']);
+} else if (OCP\User::isLoggedIn()) {
+   $currentUser = \OC::$server->getUserSession()->getUser();
+}
 
-if (!$auth) {
+if (!$currentUser) {
     echo json_encode(array(
             'result' => 'noauth',
     ));
     exit();
 }
 
+$currentUID = $currentUser->getUID();
+
 $config = \OC::$server->getConfig();
 
 $data = array();
@@ -49,7 +52,7 @@ function validateBoolean($val)
 $data ['xmpp'] ['onlogin'] = null;
 
 if (validateBoolean($config->getAppValue('ojsxc', 'xmppPreferMail'))) {
-    $mail = $config->getUserValue($username,'settings','email');
+    $mail = $config->getUserValue($currentUID,'settings','email');
 
     if ($mail !== null) {
 	list($u, $d) = explode("@", $mail, 2);
@@ -60,7 +63,7 @@ function validateBoolean($val)
     }
 }
 
-$options = $config->getUserValue($username, 'ojsxc', 'options');
+$options = $config->getUserValue($currentUID, 'ojsxc', 'options');
 
 if ($options !== null) {
     $options = (array) json_decode($options, true);

build/appinfo/info.xml

@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.1.0-beta.2</version>
+   <version>3.1.0</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

build/css/jsxc.oc.css

@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.1.0-beta.2 - 2017-02-10
+ * ojsxc v3.1.0 - 2017-02-14
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.1.0-beta.2
+ * @version 3.1.0
  * @license MIT
  */
 

build/js/admin.js

@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.1.0-beta.2 - 2017-02-10
+ * ojsxc v3.1.0 - 2017-02-14
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.1.0-beta.2
+ * @version 3.1.0
  * @license MIT
  */
 

build/js/eof.js

@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.1.0-beta.2 - 2017-02-10
+ * ojsxc v3.1.0 - 2017-02-14
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.1.0-beta.2
+ * @version 3.1.0
  * @license MIT
  */
 

build/js/jsxc/jsxc.js

@@ -1,13 +1,13 @@
 /*!
- * jsxc v3.1.0-beta.2 - 2017-02-10
+ * jsxc v3.1.0 - 2017-02-14
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.1.0-beta.2
+ * @version 3.1.0
  * @license MIT
  */
 
@@ -25,7 +25,7 @@ var jsxc = null, RTC = null, RTCPeerconnection = null;
  */
 jsxc = {
    /** Version of jsxc */
-   version: '3.1.0-beta.2',
+   version: '3.1.0',
 
    /** True if i'm the master */
    master: false,