Index: /freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.general.php
===================================================================
--- /freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.general.php (revision 2672)
+++ /freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.general.php (revision 2733)
@@ -29,4 +29,5 @@
 						array($_REQUEST['TRUNK_OPTIONS'],'TRUNK_OPTIONS'),
 						array($_REQUEST['TONEZONE'], 'TONEZONE'),
+						array($_REQUEST['TIMEFORMAT'], 'TIMEFORMAT'),
 						array($_REQUEST['ALLOW_SIP_ANON'], 'ALLOW_SIP_ANON'),
 						array($_REQUEST['OPERATOR_XTN'], 'OPERATOR_XTN'),
@@ -163,4 +164,11 @@
 		?>
 </p>
+<p>
+	<a class="info" href="#"><?php echo _("24-hour format")?><span><?php echo _("Select Yes if you use 24-hour format or No if you are using 12-hour am/pm format")?></span></a>&nbsp;
+	<select name="TIMEFORMAT">
+		<option value="IMp"><?php echo _("no"); ?></option>
+		<option value="kM" <?php echo (($TIMEFORMAT=="kM") ? 'selected="selected"' : '');?>><?php echo _("yes"); ?></option>
+	</select>
+</p>
 <h5><?php echo _("Security Settings")?></h5>
 <p>
Index: /freepbx/trunk/SQL/newinstall.sql
===================================================================
--- /freepbx/trunk/SQL/newinstall.sql (revision 2642)
+++ /freepbx/trunk/SQL/newinstall.sql (revision 2733)
@@ -99,4 +99,5 @@
 INSERT INTO `globals` VALUES ('VM_PREFIX', '*');
 INSERT INTO `globals` VALUES ('VM_OPTS', '');
+INSERT INTO `globals` VALUES ('TIMEFORMAT', 'kM');
 
 -- --------------------------------------------------------
Index: /freepbx/trunk/SQL/newinstall.sqlite.sql
===================================================================
--- /freepbx/trunk/SQL/newinstall.sqlite.sql (revision 2723)
+++ /freepbx/trunk/SQL/newinstall.sqlite.sql (revision 2733)
@@ -99,4 +99,5 @@
 INSERT INTO globals VALUES ('VM_PREFIX', '*');
 INSERT INTO globals VALUES ('VM_OPTS', '');
+INSERT INTO globals VALUES ('TIMEFORMAT', 'kM');
 
 -- --------------------------------------------------------
Index: /freepbx/trunk/upgrades/2.2.0beta1/tables.php
===================================================================
--- /freepbx/trunk/upgrades/2.2.0beta1/tables.php (revision 2243)
+++ /freepbx/trunk/upgrades/2.2.0beta1/tables.php (revision 2733)
@@ -104,3 +104,12 @@
 	out("Already exists!");
 }
+
+outn("Checking for Global var TIMEFORMAT..");
+$nrows = $db->getOne("SELECT count(*) from globals where variable='TIMEFORMAT'");
+if (!$nrows) {
+	$db->query("insert into globals values ('TIMEFORMAT', 'kM')");
+	out("Created");
+} else {
+	out("Already exists!");
+}
 ?>