From 4744de1a17b85e337cf6a3dd915328fc1e777e4c Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Sun, 20 Sep 2015 15:01:20 +0300
Subject: [PATCH] fix missing variable in extensionstatus.php set  new created
 operators to have "normal" skills (1 and 5), removed initial operator skills
 setup on create to avoid mismatch with operatorskills.php,  hide chat setup
 parameters if disabled, filter extension assign if Freepbx location is not
 set  and hide setup parameters if uses_voip = off

---
 admin/extensionstatus.php |  43 +++++++------
 admin/operatorlist.php    |  98 +++++++++++++++++-------------
 admin/operators.php       | 123 ++++++++++++++++++--------------------
 3 files changed, 137 insertions(+), 127 deletions(-)

diff --git a/admin/extensionstatus.php b/admin/extensionstatus.php
index c2e0c82a..baf4c0a5 100644
--- a/admin/extensionstatus.php
+++ b/admin/extensionstatus.php
@@ -185,41 +185,43 @@ if (isset($_GET['edit']) || isset($_GET['addext']))
           WHERE extension_id = " . intval($_GET['edit']);
 
 	$rs = $db->GetRow($sql);
-	} else $rs = array();
-	
-  print "<a href='?' class='btn btn-default pull-left'>" . T_("Go back") . "</a>";
+	}
+
 ?>
 	<div class="panel-body ">
-	<h3 class="col-sm-offset-3"><?php if (isset($_GET['edit']))echo T_("Edit extension"); else echo T_("Add an extension");?></h3>
+	<h3 class="col-lg-offset-3"><?php if (isset($_GET['edit']))echo T_("Edit extension"); else echo T_("Add an extension");?></h3>
 	<form enctype="multipart/form-data" action="?" method="post" name="editext" class="form-horizontal">
 	<div class="form-group form-inline">
-		<label class="control-label col-sm-3"><?php  echo T_("Extension name: ");?></label>
-		<input name="extension" type="text" placeholder="<?php echo T_("such as SIP/1000");?>" maxlength="12" required value="<?php echo $rs['extension'];?>" class="form-control"/>
+		<label class="control-label col-lg-3"><?php  echo T_("Extension name: ");?></label>
+		<input name="extension" type="text" placeholder="<?php echo T_("such as SIP/1000");?>" maxlength="12" required value="<?php if (isset($_GET['edit']))echo $rs['extension'];?>" class="form-control"/>
 	</div>
 	<div class="form-group form-inline">
-		<label class="control-label col-sm-3"><?php  echo T_("Extension password: ");?></label>
-		<input name="password" type="text" required pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" style="width:20em;" maxlength="50" value="<?php echo $rs['password'];?>" class="form-control pull-left" placeholder="<?php echo T_("Enter New Password");?>"/>&emsp;&emsp;<?php echo T_(" or ");?>&ensp;
+		<label class="control-label col-lg-3"><?php  echo T_("Extension password: ");?></label>
+		<input name="password" type="text" required pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" style="width:20em;" maxlength="50" value="<?php if (isset($_GET['edit'])) echo $rs['password'];?>" class="form-control pull-left" placeholder="<?php echo T_("Enter New Password");?>"/>&emsp;&emsp;<?php echo T_(" or ");?>&ensp;
 		<input type="button" onclick="generate();" value="<?php echo T_("Generate");?>" class="btn btn-default fa" />&emsp;<?php echo T_("New password");?>&ensp;
 		<input type="number" name="number" value="25" min="8" max="50" style="width:5em;"  class="form-control" />&ensp;<?php echo T_("characters long");?>
 	</div>
 
-	<div class=" col-sm-offset-3 ">
-	<input type="submit" class="btn btn-primary " value="<?php if (isset($_GET['edit'])) echo T_("Save changes"); else echo T_("Add extension"); ?>" />
-	</div>
+	<div class="form-group form-inline">
+		<div class='col-lg-3'>
+			<a href='?' class='btn btn-default'><?php echo T_("Cancel") ;?></a>
+		</div>
+
+		<input type="submit" class="btn btn-primary pull-left" value="<?php if (isset($_GET['edit'])) echo T_("Save changes"); else echo T_("Add extension"); ?>" />
 	
 <?php if (isset($_GET['edit'])){?>	
 	
 	<input name="extensionid" type="hidden" value="<?php echo intval($_GET['edit']);?>"/>
 	
 <?php if (empty($rs['current_operator_id'])) { ?>
-
-		<input type="submit" name="delete" class="btn btn-danger " data-toggle="confirmation" value="<?php  echo T_("Delete extension"); ?>" />
+		
+	<input type="submit" name="delete" class="btn btn-danger col-lg-offset-2 pull-left" data-toggle="confirmation" value="<?php  echo T_("Delete extension"); ?>" />
 		
 <?php 	} else 
 		print "</br></br><b class='well text-danger'>" . T_("Unassign the operator from this extension to be able to delete it") . "</b>";
 	} 
 
-	print "</form></div>";
+	print "</div></form></div>";
 }
 else
 {
@@ -241,8 +243,10 @@ else
 
   $rs = $db->GetAll($sql);
   
+    print "<div class='panel-body'>";
+  
   if ($msg != "")
-    print "<p>$msg</p>";
+    print "<p class='alert alert-warning'>$msg</p></br>";
   
   if (!empty($rs))
   {
@@ -258,14 +262,15 @@ else
       if ($rs[$i]['assignment'] == "list")
         $rs[$i]['assignment'] = display_chooser($ers,"operator_id_" . $rs[$i]["extension_id"],"operator_id_" . $rs[$i]["extension_id"],true,"extension_id=".$rs[$i]["extension_id"],true,false,false,false);
     }
-	print "<div class='panel-body'>";
+
   	xhtml_table($rs,array("extension","firstName","assignment","status","case_id","state","calltime"),array(T_("Extension"),T_("Operator"),T_("Assignment"),T_("VoIP Status"),T_("Case ID"),T_("Call state"),T_("Time on call")),"tclass",array("vs" => "1"));
-	print "</div>";
+	print "</br>";
   }
   else
-  	print "<p>" . T_("No extensions") . "</p>";
+  	print "<p class='alert alert-warning'>" . T_("No extensions") . "</p>";
   
-  print "<div class='col-sm-3'><a href='?addext=addext' class='btn btn-default '>" . T_("Add extension") . "</a></div>";
+  print "<a href='?addext=addext' class='btn btn-primary '>" . T_("Add extension") . "</a>
+		</div>";
 
 }
 
diff --git a/admin/operatorlist.php b/admin/operatorlist.php
index 3be9ddf5..16821cbc 100644
--- a/admin/operatorlist.php
+++ b/admin/operatorlist.php
@@ -195,7 +195,7 @@ function generate() {
 }
 </script>
 
-<div class="form-group clearfix"><div class="col-sm-3"><a href='?' class="btn btn-default"><?php echo T_("Go back") ;?></a></div><div class="col-sm-6">
+<div class="form-group clearfix"><div class="col-lg-3"><a href='?' class="btn btn-default"><?php echo T_("Go back") ;?></a></div><div class="col-lg-6">
 <?php
 	print "<h3>" . T_("Operator") . ": " . $rs['username'] . "</h3>";
 	echo "</div></div>";
@@ -213,78 +213,92 @@ function generate() {
 ?>
 	<form action="?" method="post" class="form-horizontal panel-body" name="operform">
 	<div class="form-group">
-		<label for="username" class="col-sm-3 control-label"><?php echo T_("Username") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='username' class="form-control" value="<?php echo $rs['username'];?>"/></div>
+		<label for="username" class="col-lg-3 control-label"><?php echo T_("Username") . ": "; ?></label>
+		<div class="col-lg-3"><input type='text' name='username' class="form-control" value="<?php echo $rs['username'];?>"/></div>
 	</div>
 	<div class="form-group">
-		<label for="password" class="col-sm-3 control-label"><?php echo T_("Password") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='password' class="form-control" placeholder="<?php echo T_("leave blank to keep existing password");?>"/></div>
-		<div class="col-sm-6 form-inline">&emsp;
+		<label for="password" class="col-lg-3 control-label"><?php echo T_("Password") . ": "; ?></label>
+		<div class="col-lg-3"><input type='text' name='password' class="form-control" placeholder="<?php echo T_("leave blank to keep existing password");?>"/></div>
+		<div class="col-lg-6 form-inline">&emsp;
 			<input type="button" onclick="generate();" value="<?php echo T_("Generate");?>" class="btn btn-default"/>&emsp;<?php echo T_("Password with");?>&ensp;
 			<input type="number" name="number" value="25" min="8" max="50" style="width:5em;" class="form-control" />&ensp;<?php echo T_("characters");?>
 		</div>
 	</div>
 	<div class="form-group">
-		<label for="firstName" class="col-sm-3 control-label"><?php echo T_("First name") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='firstName' class="form-control" value="<?php echo $rs['firstName'];?>"/></div>
+		<label for="firstName" class="col-lg-3 control-label"><?php echo T_("First name") . ": "; ?></label>
+		<div class="col-lg-3"><input type='text' name='firstName' class="form-control" value="<?php echo $rs['firstName'];?>"/></div>
 	</div>
 	<div class="form-group">
-		<label for="lastName" class="col-sm-3 control-label"><?php echo T_("Last name") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='lastName'  class="form-control" value="<?php echo $rs['lastName'];?>"/></div>
+		<label for="lastName" class="col-lg-3 control-label"><?php echo T_("Last name") . ": "; ?></label>
+		<div class="col-lg-3"><input type='text' name='lastName'  class="form-control" value="<?php echo $rs['lastName'];?>"/></div>
 	</div>
 	<div class="form-group">
-		<label for="email" class="col-sm-3 control-label"><?php echo T_("Email") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='email'  class="form-control" value="<?php echo $rs['email'];?>"/></div>
+		<label for="email" class="col-lg-3 control-label"><?php echo T_("Email") . ": "; ?></label>
+		<div class="col-lg-3"><input type='text' name='email'  class="form-control" value="<?php echo $rs['email'];?>"/></div>
 	</div>
 	<div class="form-group">
-		<label for="timezone" class="col-sm-3 control-label"><?php echo T_("Timezone") . ": ";?></label>
-		<div class="col-sm-3"><?php display_chooser($tz,"timezone","timezone",false,false,false,true,array("value",$rs['Time_zone_name']),true,"form-inline"); ?></div>
-		<div class="col-sm-6 form-inline">
+		<label for="timezone" class="col-lg-3 control-label"><?php echo T_("Timezone") . ": ";?></label>
+		<div class="col-lg-3"><?php display_chooser($tz,"timezone","timezone",false,false,false,true,array("value",$rs['Time_zone_name']),true,"form-inline"); ?></div>
+		<div class="col-lg-6 form-inline">
 			<?php echo T_("Edit") . "&emsp;";?>
 			<a  href='timezonetemplate.php' class="btn btn-default"><?php echo T_("TimeZones list");?></a>
 		</div>
 	</div>
- 	<div class="form-group">
-		<label for="extension_id" class="col-sm-3 control-label"><?php  echo T_("Extension") . ": "; ?></label> 
-		<div class="col-sm-3"><?php echo display_chooser($ers,"extension_id","extension_id",true,false,false,true,false,true,"form-inline"); ?> </div>
-		<div class="col-sm-6 form-inline">
-			<?php echo T_("Edit") . "&emsp;";?>
-			<a  href='extensionstatus.php' class="btn btn-default"><?php echo T_("Extensions");?></a>
+	
+	<?php  if (FREEPBX_PATH != false) { ?>
+	<div class="form-group">
+		<label for="voip" class="col-lg-3 control-label"><?php echo T_("Uses VoIP") . "? ";?></label>
+		<div class="col-lg-3"><input name="voip" type="checkbox" onchange="if(this.checked==true){show(this,'usesvoip');} else{ hide(this,'usesvoip');}" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" <?php if ($rs['voip'] == 1) echo "checked=\"checked\"";?> value="1" /></div>
+	</div>
+	<div id="usesvoip" style="display:none" >
+	<div class="form-group">
+		<label class="col-lg-3 control-label"><?php echo T_("Extension") . ": ";?></label>
+		
+	<?php if (!empty($ers) ){ ?>
+				<div class="col-lg-3"><?php display_chooser($ers,"extension_id","extension_id",true,false,false,true,false,true,"form-inline");?></div>
+				<div class="col-lg-6 form-inline"> <?php echo T_("Edit") . "&emsp;"; }
+	else{ ?>  	<div class="col-lg-6 form-inline"> <?php echo T_("Add") . "&emsp;"; }?>
+					<a  href='extensionstatus.php' class="btn btn-default fa"><?php echo T_("Extensions");?></a>
+				</div>
 		</div>
 	</div>
+<?php  } ?>
+	
 	<div class="form-group">
-		<label for="voip" class="col-sm-3 control-label"><?php echo T_("Uses VoIP") . "? ";?></label>
-		<div class="col-sm-3"><input type="checkbox" name="voip" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" <?php if ($rs['voip'] == 1) echo "checked=\"checked\"";?> value="1" /></div>
+		<label class="col-lg-3 control-label"><?php echo T_("Uses chat") . "? ";?></label>
+		<div class="col-lg-3"><input name="chat_enable" type="checkbox" onchange="if(this.checked==true){show(this,'jabdata');} else{ hide(this,'jabdata');}" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" <?php if ($rs['chat_enable'] == 1) echo "checked=\"checked\"";?> value="1"/></div>
 	</div>
-	<div class="form-group">
-		<label for="chat_user" class="col-sm-3 control-label"><?php echo T_("Jabber/XMPP chat user") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='chat_user' class="form-control" value="<?php echo $rs['chat_user'];?>"/></div>
+
+	<div id="jabdata" style="display:none" >
+		<div class="form-group">
+			<label class="col-lg-3 control-label"><?php echo T_("Jabber/XMPP chat user") . ": ";?></label>
+			<div class="col-lg-3"><input name="chat_user" type="text" class="form-control" value="<?php echo $rs['chat_user'];?>"/></div>
+		</div>
+		<div class="form-group">
+		<label class="col-lg-3 control-label"><?php echo T_("Jabber/XMPP chat password") . ": ";?></label>
+			<div class="col-lg-3"><input name="chat_password" type="text" class="form-control" value="<?php echo $rs['chat_password'];?>"/></div>
+		</div>
 	</div>
+	
+	
 	<div class="form-group">
-		<label for="chat_password" class="col-sm-3 control-label"><?php echo T_("Jabber/XMPP chat password") . ": "; ?></label>
-		<div class="col-sm-3"><input type='text' name='chat_password' class="form-control" value="<?php echo $rs['chat_password'];?>"/></div>
-  </div>
-	<div class="form-group">
-		<label for="admin" class="col-sm-3 control-label"><?php echo T_("Is the operator a system administrator?");?></label>
-    <div class="col-sm-3"><input name="admin" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-offstyle="primary" data-onstyle="danger" <?php if ($rs['superadmin'] || ($rs['parent_id'] == 0)) echo " checked=\"checked\" "; if ($rs['parent_id'] == 0) echo " disabled=\"disabled\" "; ?> value="1"/></div>
+		<label for="admin" class="col-lg-3 control-label"><?php echo T_("Is the operator a system administrator?");?></label>
+    <div class="col-lg-3"><input name="admin" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-offstyle="primary" data-onstyle="danger" <?php if ($rs['superadmin'] || ($rs['parent_id'] == 0)) echo " checked=\"checked\" "; if ($rs['parent_id'] == 0) echo " disabled=\"disabled\" "; ?> value="1"/></div>
 	</div>
+
 	<div class="form-group">
-		<label for="chat_enable" class="col-sm-3 control-label"><?php echo T_("Uses chat") . "? ";?></label>
-		<div class="col-sm-3"><input type="checkbox" name="chat_enable" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" <?php if ($rs['chat_enable'] == 1) echo "checked=\"checked\"";?> value="1"/></div>
-	</div>
-	<div class="form-group">
-		<label for="enabled" class="col-sm-3 control-label"><?php echo T_("Enabled") . "? ";?></label>
-		<div class="col-sm-3"><input type="checkbox" name="enabled" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" <?php if ($rs['enabled'] == 1) echo "checked=\"checked\"";?> value="1" /></div>
+		<label for="enabled" class="col-lg-3 control-label"><?php echo T_("Enabled") . "? ";?></label>
+		<div class="col-lg-3"><input type="checkbox" name="enabled" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" <?php if ($rs['enabled'] == 1) echo "checked=\"checked\"";?> value="1" /></div>
 	</div>
 	<div><input type='hidden' name='operator_id' value='<?php echo $operator_id;?>'/></div>
 	<div><input type='hidden' name='existing_username' value="<?php echo $rs['username'];?>"/></div>
 
-	<div class="form-group"><div class="col-sm-3 col-sm-offset-3"><input type="submit" name="submit" class="btn btn-primary btn-block" value="<?php echo T_("Update operator");?>"/></div></div>
+	<div class="form-group"><div class="col-lg-3 col-lg-offset-3"><input type="submit" name="submit" class="btn btn-primary btn-block" value="<?php echo T_("Update operator");?>"/></div></div>
 	</form>
 
 
 	<?php	
-	xhtml_foot();
+	xhtml_foot(array("../js/new.js"));
 	exit();
 }
 
@@ -402,11 +416,11 @@ if ($display)
 		$titles[] = T_("Win file");//Windows VoIP
 		$titles[] = T_("*nix flle");//*nix VoIP
 	}
-	echo "<div class='col-sm-9'><div class='panel-body'>";
+	echo "<div class='col-lg-9'><div class='panel-body'>";
 	xhtml_table($rs,$columns,$titles);
 	echo "</div></div>";
 	
-	echo "<div class='form-group col-sm-3'>
+	echo "<div class='form-group col-lg-3'>
 			<div class='panel-body'><a href='operators.php?add=add' class='btn btn-default btn-block'><i class='fa fa-lg fa-user-plus'></i>&emsp;" . T_("Add an operator") . "</a></div>
 			<div class='panel-body'><a href='extensionstatus.php' class='btn btn-default btn-block'><i class='fa fa-lg fa-whatsapp'></i>&emsp;" . T_("Extensions") . "</a></div>
 			<div class='panel-body'><a href='operatorquestionnaire.php' class='btn btn-default btn-block'><i class='fa fa-lg fa-link'></i>  " . T_("Assign to questionnaire") . "</a></div>
diff --git a/admin/operators.php b/admin/operators.php
index 9f5724cd..5221429a 100644
--- a/admin/operators.php
+++ b/admin/operators.php
@@ -96,15 +96,11 @@ if (isset($_POST['operator']) && isset($_POST['adduser']))
 		$extensionp = "'$extensionnp'";
 
 	}
-	$supervisor = 0;
-	$temporary = 0;
+
 	$admin = 0;
-	$refusal = 0;
 	$voip = 0;
 	$chat = 0;
-	if (isset($_POST['supervisor']) && $_POST['supervisor'] == "on") $supervisor = 1;
-	if (isset($_POST['refusal']) && $_POST['refusal'] == "on") $refusal = 1;
-	if (isset($_POST['temporary']) && $_POST['temporary'] == "on") $temporary = 1;	
+	
 	if (isset($_POST['admin']) && $_POST['admin'] == "on") $admin = 1;	
 	if (isset($_POST['voip']) && $_POST['voip'] == "on") $voip = 1;	
 	if (isset($_POST['chat_enable']) && $_POST['chat_enable'] == "on") $chat = 1;	
@@ -149,26 +145,18 @@ if (isset($_POST['operator']) && isset($_POST['adduser']))
 
 			$a = "<div class='alert alert-info'><h3>" . T_("Added operator :") . " " .  $operator . "</h3>";	
 
-			if (FREEPBX_PATH !== false)
+			if (FREEPBX_PATH !== false) 
 				$a .= "<br/><a href='/voip/admin/'>" . T_("FreePBX needs to be reloaded for the new VoIP extension to take effect") . "</a>";
 			
-			print "</div>";	
+			$a .= "</div>";	
+
+			// set default skills = 1 and 5 for all new operators
 
-			if ($temporary)
-			{
 				$db->Execute("  INSERT INTO operator_skill (operator_id,outcome_type_id)
 					VALUES ('$oid','1')");
 				$db->Execute("  INSERT INTO operator_skill (operator_id,outcome_type_id)
 					VALUES ('$oid','5')"); //and appointment
-			}
 
-			if ($supervisor)
-				$db->Execute("  INSERT INTO operator_skill (operator_id,outcome_type_id)
-						VALUES ('$oid','2')");
-
-			if ($refusal)
-				$db->Execute("  INSERT INTO operator_skill (operator_id,outcome_type_id)
-						VALUES ('$oid','3')");
 		}
 		else
 		{
@@ -242,84 +230,87 @@ function generate() {
 
 <form enctype="multipart/form-data" action="" method="post" class="form-horizontal panel-body" name="operform">
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Username") . ": ";?></label>
-		<div class="col-sm-3"><input name="operator" type="text" class="form-control" required /></div>
+		<label class="col-lg-3 control-label"><?php echo T_("Username") . ": ";?></label>
+		<div class="col-lg-3"><input name="operator" type="text" class="form-control" required /></div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Password") . ": ";?></label>
-		<div class="col-sm-3"><input name="password" id="password" type="text" class="form-control" required /></div>
-		<div class="col-sm-6 form-inline">&emsp;
+		<label class="col-lg-3 control-label"><?php echo T_("Password") . ": ";?></label>
+		<div class="col-lg-3"><input name="password" id="password" type="text" class="form-control" required /></div>
+		<div class="col-lg-6 form-inline">&emsp;
 			<input type="button" onclick="generate();" value="<?php echo T_("Generate");?>" class="btn btn-default fa" />&emsp;<?php echo T_("Password with");?>&ensp;
 			<input type="number" name="number" value="25" min="8" max="50" style="width:5em;"  class="form-control" />&ensp;<?php echo T_("characters");?>
 		</div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("First name") . ": ";?></label>
-		<div class="col-sm-3"><input name="firstname" type="text" class="form-control" required/></div>
+		<label class="col-lg-3 control-label"><?php echo T_("First name") . ": ";?></label>
+		<div class="col-lg-3"><input name="firstname" type="text" class="form-control" required/></div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Last name") . ": ";?></label>
-		<div class="col-sm-3"><input name="lastname" type="text" class="form-control"/></div>
+		<label class="col-lg-3 control-label"><?php echo T_("Last name") . ": ";?></label>
+		<div class="col-lg-3"><input name="lastname" type="text" class="form-control"/></div>
 	</div>
   <div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Email") . ": ";?></label>
-		<div class="col-sm-3"><input name="email" type="text" class="form-control"/></div>
+		<label class="col-lg-3 control-label"><?php echo T_("Email") . ": ";?></label>
+		<div class="col-lg-3"><input name="email" type="text" class="form-control"/></div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Timezone") . ": ";?></label>
-		<div class="col-sm-3"><?php display_chooser($rs,"Time_zone_name","Time_zone_name",false,false,false,true,array("value",get_setting("DEFAULT_TIME_ZONE")),true,"form-inline");?></div>
-		<div class="col-sm-6 form-inline">
+		<label class="col-lg-3 control-label"><?php echo T_("Timezone") . ": ";?></label>
+		<div class="col-lg-3"><?php display_chooser($rs,"Time_zone_name","Time_zone_name",false,false,false,true,array("value",get_setting("DEFAULT_TIME_ZONE")),true,"form-inline");?></div>
+		<div class="col-lg-6 form-inline">
 			<?php echo T_("Edit") . "&emsp;";?>
 			<a  href='timezonetemplate.php' class="btn btn-default fa"><?php echo T_("TimeZones list");?></a>
 		</div>
 	</div>
-<?php  if (FREEPBX_PATH == false) { ?>
+<?php  if (FREEPBX_PATH != false) { ?>
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Extension") . ": ";?></label>
-		<div class="col-sm-3"><?php display_chooser($ers,"extension_id","extension_id",true,false,false,true,false,true,"form-inline");?></div>
-		<div class="col-sm-6 form-inline">
+		<label class="col-lg-3 control-label"><?php echo T_("Uses VoIP") . "? ";?></label>
+		<div class="col-lg-3"><input name="voip" type="checkbox" onchange="if(this.checked==true){show(this,'usesvoip');} else{ hide(this,'usesvoip');}" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" /></div><!-- checked="checked" -->
+	</div>
+	<div id="usesvoip" style="display:none" >
+	<div class="form-group">
+		<label class="col-lg-3 control-label"><?php echo T_("Extension") . ": ";?></label>
+		<div class="col-lg-3"><?php display_chooser($ers,"extension_id","extension_id",true,false,false,true,false,true,"form-inline");?></div>
+		<div class="col-lg-6 form-inline">
 			<?php echo T_("Edit") . "&emsp;";?>
 			<a  href='extensionstatus.php' class="btn btn-default fa"><?php echo T_("Extensions");?></a>
 		</div>
 	</div>
+	</div>
 <?php  } ?>
 
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Uses VoIP") . "? ";?></label>
-		<div class="col-sm-3"><input name="voip" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" checked="checked"/></div>
+		<label class="col-lg-3 control-label"><?php echo T_("Uses chat") . "? ";?></label>
+		<div class="col-lg-3"><input name="chat_enable" type="checkbox" onchange="if(this.checked==true){show(this,'jabdata');} else{ hide(this,'jabdata');}" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" /></div>
 	</div>
+
+	<div id="jabdata" style="display:none" >
+		<div class="form-group">
+			<label class="col-lg-3 control-label"><?php echo T_("Jabber/XMPP chat user") . ": ";?></label>
+			<div class="col-lg-3"><input name="chat_user" type="text" class="form-control"/></div>
+		</div>
+		<div class="form-group">
+		<label class="col-lg-3 control-label"><?php echo T_("Jabber/XMPP chat password") . ": ";?></label>
+			<div class="col-lg-3"><input name="chat_password" type="text" class="form-control"/></div>
+		</div>
+	</div>
+
 	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Jabber/XMPP chat user") . ": ";?></label>
-		<div class="col-sm-3"><input name="chat_user" type="text" class="form-control"/></div>
+		<label class="col-lg-3 control-label"><?php echo T_("Is the operator a system administrator?");?></label>
+		<div class="col-lg-3"><input name="admin" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-onstyle="danger"/></div>
 	</div>
-	<div class="form-group">
-	<label class="col-sm-3 control-label"><?php echo T_("Jabber/XMPP chat password") . ": ";?></label>
-		<div class="col-sm-3"><input name="chat_password" type="text" class="form-control"/></div>
+
+	<br/>
+	<div class="form-group form-inline">
+		<div class='col-lg-3'>
+			<a href='operatorlist.php' class='btn btn-default col-lg-6'><?php echo T_("Cancel") ;?></a>
+		</div>
+		
+		<div class="col-lg-3">
+			<input type="submit" name="adduser" class="btn btn-primary btn-block" value="<?php  echo T_("Add an operator"); ?>" />
+		</div>
 	</div>
-	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Uses chat") . "? ";?></label>
-		<div class="col-sm-3"><input name="chat_enable" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" /></div>
-	</div>
-	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Is the operator a system administrator?");?></label>
-		<div class="col-sm-3"><input name="admin" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-offstyle="primary" data-onstyle="danger"/></div>
-	</div>
-	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Is the operator a normal interviewer?");?></label>
-		<div class="col-sm-3"><input name="temporary" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-offstyle="danger" checked="checked"/></div>
-	</div>
-	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Is the operator a supervisor?");?></label>
-		<div class="col-sm-3"><input name="supervisor" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-onstyle="danger" data-offstyle="primary"/></div>
-	</div>
-	<div class="form-group">
-		<label class="col-sm-3 control-label"><?php echo T_("Is the operator a refusal converter?");?></label>
-		<div class="col-sm-3"><input name="refusal" type="checkbox" data-toggle="toggle" data-on="<?php echo T_("Yes"); ?>" data-off="<?php echo T_("No"); ?>" data-onstyle="danger" data-offstyle="primary"/></div>
-	</div>
-	
-	<div class="form-group"><div class="col-sm-3 col-sm-offset-3"><input type="submit" name="adduser" class="btn btn-primary btn-block" value="<?php  echo T_("Add an operator"); ?>" /></div></div>
 </form>
 
 <?php 
-xhtml_foot();
+xhtml_foot(array("../js/new.js"));
 ?>