Merge branch 'release/v2.0.2'

# Conflicts:
#	templates/base.php

NOTICE

@@ -33,6 +33,30 @@ Copyright 2013-2017 Opera Software AS
    See the License for the specific language governing permissions and
    limitations under the License.
 
+Component: PHP Secure Communications Library
+
+Copyright 2007-2016 TerraFrost and other contributors
+http://phpseclib.sourceforge.net/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 Component: Bootstrap Framework
 
 The MIT License (MIT)

model/userdirectory.php

@@ -37,6 +37,7 @@ public function add_user(User $user) {
 			$stmt->bind_param('dsssdds', $user->entity_id, $user_id, $user_name, $user_email, $user_active, $user_admin, $user->auth_realm);
 			$stmt->execute();
 			$stmt->close();
+			$user->log(array('action' => 'User add'));	
 		} catch(mysqli_sql_exception $e) {
 			if($e->getCode() == 1062) {
 				// Duplicate entry
@@ -45,7 +46,6 @@ public function add_user(User $user) {
 				throw $e;
 			}
 		}	
-		$user->log(array('action' => 'User add'));	
 	}
 
 	/**

scripts/sync.php

@@ -446,7 +446,7 @@ function sync_server($id, $only_username = null, $preview = false) {
 								echo "Unable to transfer file using scp";
 							}
 							if($success) {
-								$ssh->exec('/usr/bin/env chmod 600 '.escapeshellarg($remote_filename));
+								$ssh->exec('/usr/bin/env chmod 644 '.escapeshellarg($remote_filename));
 								$success = !is_bool($ssh->getExitStatus()) && $ssh->getExitStatus() == 0;
 								if(!$success) {
 									echo "Unable to change permission";

templates/base.php

@@ -50,7 +50,7 @@
 </div>
 <div id="footer">
 	<div class="container">
-		<p class="text-muted credit"><?php out($web_config['footer'], ESC_NONE)?> (v2.0.1)</p>
+		<p class="text-muted credit"><?php out($web_config['footer'], ESC_NONE)?> (v2.0.2)</p>
 		<?php if($this->get('active_user') && $this->get('active_user')->developer) { ?>
 		<?php } ?>
 	</div>

templates/users.php

@@ -49,7 +49,7 @@
 				<label for="email">Mail Address</label>
 				<input type="email" id="email" name="email" class="form-control" required>
 			</div>		
-			<input type="checkbox" name="admin" value="admin">Administrator<br><br>
+			<input type="checkbox" name="admin" value="admin"> Administrator<br><br>
 			<button type="submit" name="add_user" value="1" class="btn btn-primary">Add user</button>
 		</form>
 	</div>