X-Git-Url: https://git.defcon.no/?a=blobdiff_plain;f=api%2Flib%2Fuser_functions.php;h=c8556f149476fd04fcb3f2bb243f1ed92f92018e;hb=7ba75390b050c627e8466d046dfcdc83bd2d1ab6;hp=f1e660bb55e87ad84caf365d1b82fb49fc50f89d;hpb=3b7b5ca848177cc351e0ee623cd9621b7a46eb7b;p=hermes

diff --git a/api/lib/user_functions.php b/api/lib/user_functions.php
index f1e660b..c8556f1 100644
--- a/api/lib/user_functions.php
+++ b/api/lib/user_functions.php
@@ -1,14 +1,41 @@
 <?php
+/*
+#  Copyright (c) 2012, Gjøvik University College
+#  All rights reserved.
+
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
+#      * Neither the name of the Gjøvik University College nor the
+#        names of its contributors may be used to endorse or promote products
+#        derived from this software without specific prior written permission.
+#  
+#  THIS SOFTWARE IS PROVIDED BY Gjøvik University College ''AS IS'' AND ANY
+#  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+#  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+#  DISCLAIMED. IN NO EVENT SHALL Gjøvik University College BE LIABLE FOR ANY
+#  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+#  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+#  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 require_once('config.php');
 require_once('lib/common_functions.php');
 require_once('lib/db_functions.php');
 
 $config = get_config();
 
-// Default length 24 characters to provide a long password
-// that still is short enough that Cisco SPA phones can use it
-function generate_password( $length = 24 )
+function generate_password( $length = null )
 {
+	global $config;
+	if ( ! $length ) $length = $config['standard_password_length'];
+
 	$string = "";
 	 while ( strlen( $string ) < $length )
 	 {
@@ -280,7 +307,7 @@ function get_userdata( $username, $domain )
 	if ( $type == 'local' )
 	{
 		// WARNING: Note the typo in the name of the 'permittedcalls' column!
-		$query_kamailio = sprintf ("SELECT id, username, domain, password, email_address, ha1, ha1b, rpid, permitedcalls FROM %s WHERE username = '%s' AND domain = '%s'",
+		$query_kamailio = sprintf ("SELECT id, username, domain, password, email_address, ha1, ha1b, rpid, permittedcalls FROM %s WHERE username = '%s' AND domain = '%s'",
 			$config['kamailio_subscriber_table'],
 			sql_clean($username),
 			sql_clean($domain));
@@ -305,7 +332,7 @@ function get_userdata( $username, $domain )
 		$user['ha1']   = $kamailio_data['ha1'];
 		$user['ha1b']  = $kamailio_data['ha1b'];
 		$user['rpid']  = $kamailio_data['rpid'];
-		$user['permittedcalls'] = $kamailio_data['permitedcalls'];
+		$user['permittedcalls'] = $kamailio_data['permittedcalls'];
 	}
 
 	return $user;