Fixed some errors and misprints

Dmitriy V. Zimin · Dmitriy V. Zimin · commit 92ba12e2da66 · 2022-03-29T10:09:21.000+03:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# LDAP phonebook
+# NO WAR - LDAP phonebook
 [:ru:](#корпоративный-телефонный-справочник-с-отображением-контактов-на-карте-офиса) [:us:](#corporate-phone-directory-with-contacts-displayed-on-the-office-map)  
 [Development ветка](https://github.com/pfzim/ldap-phonebook/tree/dev)  
 Вопросы предпочтительнее [задавать в Issues](https://github.com/pfzim/ldap-phonebook/issues?q=), а не по почте
diff --git a/install.php b/install.php
@@ -1446,7 +1446,7 @@ function f_remove_self(id)
 			<div class="form-group">
 				<label for="db_name" class="control-label col-sm-2">DB name:</label>
 				<div class="col-sm-5">
-					<input id="db_name" name="db_name" class="form-control" type="text" value="websco" />
+					<input id="db_name" name="db_name" class="form-control" type="text" value="pb" />
 				</div>
 			</div>
 			<div class="form-group">
@@ -1660,7 +1660,7 @@ function f_remove_self(id)
 				</div>
 			</div>
 			<div class="form-group">
-				<label for="web_url" class="control-label col-sm-2">WebSCO URL (with trailing slash):</label>
+				<label for="web_url" class="control-label col-sm-2">URL (with trailing slash):</label>
 				<div class="col-sm-5">
 					<input id="web_url" name="web_url" class="form-control" type="text" value="<?php eh($web_url) ?>" />
 				</div>
diff --git a/routes/contacts_sync.php b/routes/contacts_sync.php
@@ -39,9 +39,14 @@ function contacts_sync(&$core, $params, $post_data)
 			throw new Exception('ldap_search return error: '.ldap_error($core->LDAP->get_link()));
 		}
 
+		$matcheddn = NULL;
+		$referrals = NULL;
+		$errcode = NULL;
+		$errmsg = NULL;
+		
 		if(!ldap_parse_result($core->LDAP->get_link(), $result, $errcode , $matcheddn , $errmsg , $referrals, $controls))
 		{
-			throw new Exception('ldap_parse_result return error: '.ldap_error($core->LDAP->get_link()));
+			throw new Exception('ldap_parse_result return error code: '.$errcode.', message: '.$errmsg.', ldap_error: '.ldap_error($core->LDAP->get_link()));
 		}
 
 		$entries = ldap_get_entries($core->LDAP->get_link(), $result);
diff --git a/routes/register.php b/routes/register.php
@@ -68,7 +68,7 @@ function register(&$core, $params, $post_data)
 
 		$plain = 'To approve new registered user follow this link: '.WEB_LINK_EXTERNAL.'register_approve_form/'.$user_id;
 
-		$core->Mailer->send_mail(array(MAIL_TO_ADMIN), LL('ApproveRequestSubject'), $html, $plain);
+		$core->Mailer->send_mail(array(MAIL_ADMIN), LL('ApproveRequestSubject'), $html, $plain);
 
 		log_db('Registered new user', '{id='.$user_id.',login="'.$login.'"}', 0);
 		$result_json['message'] = LL('UserRegistered');
diff --git a/templates/tpl.users.php b/templates/tpl.users.php
@@ -1,5 +1,4 @@
 <?php include(TEMPLATES_DIR.'tpl.header.php'); ?>
-<?php include(TEMPLATES_DIR.'tpl.tree-list.php'); ?>
 
 <div>
 	<div class="content-box">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# LDAP phonebook`
	`1`	`+# NO WAR - LDAP phonebook`
`2`	`2`	`[:ru:](#корпоративный-телефонный-справочник-с-отображением-контактов-на-карте-офиса) [:us:](#corporate-phone-directory-with-contacts-displayed-on-the-office-map)`
`3`	`3`	`[Development ветка](https://github.com/pfzim/ldap-phonebook/tree/dev)`
`4`	`4`	`Вопросы предпочтительнее [задавать в Issues](https://github.com/pfzim/ldap-phonebook/issues?q=), а не по почте`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,14 @@ function contacts_sync(&$core, $params, $post_data)`
`39`	`39`	`throw new Exception('ldap_search return error: '.ldap_error($core->LDAP->get_link()));`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ $matcheddn = NULL;`
	`43`	`+ $referrals = NULL;`
	`44`	`+ $errcode = NULL;`
	`45`	`+ $errmsg = NULL;`
	`46`	`+`
`42`	`47`	`if(!ldap_parse_result($core->LDAP->get_link(), $result, $errcode , $matcheddn , $errmsg , $referrals, $controls))`
`43`	`48`	`{`
`44`		`- throw new Exception('ldap_parse_result return error: '.ldap_error($core->LDAP->get_link()));`
	`49`	`+ throw new Exception('ldap_parse_result return error code: '.$errcode.', message: '.$errmsg.', ldap_error: '.ldap_error($core->LDAP->get_link()));`
`45`	`50`	`}`
`46`	`51`
`47`	`52`	`$entries = ldap_get_entries($core->LDAP->get_link(), $result);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php include(TEMPLATES_DIR.'tpl.header.php'); ?>`
`2`		`-<?php include(TEMPLATES_DIR.'tpl.tree-list.php'); ?>`
`3`	`2`
`4`	`3`	`<div>`
`5`	`4`	`<div class="content-box">`