diff --git a/NOTICE b/NOTICE index 96a4d2e..7a38e59 100644 --- a/NOTICE +++ b/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) diff --git a/model/userdirectory.php b/model/userdirectory.php index b7db1ad..3ca9527 100644 --- a/model/userdirectory.php +++ b/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')); } /** diff --git a/scripts/sync.php b/scripts/sync.php index 5a0e557..9b43606 100755 --- a/scripts/sync.php +++ b/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"; diff --git a/templates/base.php b/templates/base.php index d7c1dc1..bfe1c1d 100644 --- a/templates/base.php +++ b/templates/base.php @@ -50,7 +50,7 @@
- Administrator