- [DEV-172] added support of Apache authentication (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5724 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 14 insertions, 20 deletions

diff --git a/frontends/php/include/classes/cldap.inc.php b/frontends/php/include/classes/cldap.inc.php
index f9aa112f..81179a39 100644
--- a/frontends/php/include/classes/cldap.inc.php
+++ b/frontends/php/include/classes/cldap.inc.php
@@ -49,7 +49,7 @@ class CLdap{
 				'referrals'=> 		0,
 				'version'=> 		3,
 				
-				'starttls'=>		false,
+				'starttls'=>		null,
 				'deref'=>			null,
 			);
 
@@ -82,7 +82,7 @@ class CLdap{
 			}
 			else{
 //use TLS (needs version 3)
-				if(!empty($this->cnf['starttls'])){
+				if(isset($this->cnf['starttls'])){
 					if(!ldap_start_tls($this->ds)){
 						error('Starting TLS failed');
 					}
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index ef5d33ab..07610a02 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -23,6 +23,7 @@
 	
 	define('ZBX_AUTH_INTERNAL',	0);
 	define('ZBX_AUTH_LDAP',		1);
+	define('ZBX_AUTH_HTTP',		2);
 	
 	define('PAGE_TYPE_HTML',		0);
 	define('PAGE_TYPE_IMAGE',		1);
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 81afe4a9..600e8fbd 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -23,17 +23,13 @@
 
 	require_once 	"include/users.inc.php";
 
-	function	insert_slideshow_form()
-	{
-		global $_REQUEST;
-
+	function insert_slideshow_form(){
 		$form = new CFormTable(S_SLIDESHOW, null, 'post');
 		$form->SetHelp('config_advanced.php');
 		
 		$form->AddVar('config', 1);
 			
-		if(isset($_REQUEST['slideshowid']))
-		{
+		if(isset($_REQUEST['slideshowid'])){
 			$form->AddVar('slideshowid', $_REQUEST['slideshowid']);
 		}
 
@@ -43,16 +39,15 @@
 
 		$new_step	= get_request('new_step', null);
 		
-		if((isset($_REQUEST['slideshowid']) && !isset($_REQUEST['form_refresh'])))
-		{
+		if((isset($_REQUEST['slideshowid']) && !isset($_REQUEST['form_refresh']))){
 			$slideshow_data = DBfetch(DBselect('SELECT * FROM slideshows WHERE slideshowid='.$_REQUEST['slideshowid']));
 		
 			$name		= $slideshow_data['name'];
 			$delay		= $slideshow_data['delay'];
 			$steps		= array();
 			$db_steps = DBselect('SELECT * FROM slides WHERE slideshowid='.$_REQUEST['slideshowid'].' order by step');
-			while($step_data = DBfetch($db_steps))
-			{
+			
+			while($step_data = DBfetch($db_steps)){
 				$steps[$step_data['step']] = array(
 						'screenid' => $step_data['screenid'],
 						'delay' => $step_data['delay']
@@ -66,14 +61,13 @@
 		
 		$tblSteps = new CTableInfo(S_NO_SLIDES_DEFINED);
 		$tblSteps->SetHeader(array(S_SCREEN, S_DELAY, SPACE));
-		if(count($steps) > 0)
-		{
+		if(count($steps) > 0){
 			ksort($steps);
 			$first = min(array_keys($steps));
 			$last = max(array_keys($steps));
 		}
-		foreach($steps as $sid => $s)
-		{
+		
+		foreach($steps as $sid => $s){
 			if( !isset($s['screenid']) ) $s['screenid'] = 0;
 
 			if(isset($s['delay']) && $s['delay'] > 0 )
@@ -82,15 +76,13 @@
 				$s['delay'] = $delay;
 			
 			$up = null;
-			if($sid != $first)
-			{
+			if($sid != $first){
 				$up = new CLink(S_UP,'#','action');
 				$up->OnClick("return create_var('".$form->GetName()."','move_up',".$sid.", true);");
 			}
 			
 			$down = null;
-			if($sid != $last)
-			{
+			if($sid != $last){
 				$down = new CLink(S_DOWN,'#','action');
 				$down->OnClick("return create_var('".$form->GetName()."','move_down',".$sid.", true);");
 			}
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 98cfb807..2e41c62e 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -509,6 +509,7 @@
 	'S_WAS_NOT'=>						'was not',
 	'S_SUCCESSFUL_SMALL'=>				'successful',
 	'S_MUST_BE_VALID_SMALL'=>			'must be valid',
+	'S_HTTP_AUTH'=>						'HTTP Authentication',
 	
 
 //	Latest values