Changeset 5896
- Timestamp:
- 07/03/08 15:47:34 (2 months ago)
- Files:
-
- modules/branches/2.5/phonebook/functions.inc.php (modified) (2 diffs)
- modules/branches/2.5/phonebook/page.phonebook.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.5/phonebook/functions.inc.php
r5893 r5896 70 70 } 71 71 72 function phonebook_add($number, $name, $speeddial ){72 function phonebook_add($number, $name, $speeddial, $gensd){ 73 73 global $amp_conf; 74 74 global $astman; … … 79 79 if ($astman) { 80 80 // Was the user a twonk and didn't specify a speeddial? 81 // Should we really automatically generate a speeddial ? 81 // Should we really automatically generate a speeddial ? definatly only when gensd is checked 82 82 // If yes I think we should start from 99 going down and leave easier speeddials to users 83 if ($needsd) { 84 if (empty($speeddial)) { 85 for ($nbr = 99; $nbr > 0; $nbr--) { 86 if ($astman->database_get("sysspeeddials",sprintf("%02d",$nbr))===false) { 87 $speeddial = sprintf("%02d", $nbr); 88 break; 89 } 90 } 91 } 92 } 93 $astman->database_put("cidname",$number, '"'.$name.'"'); 94 if ($speeddial != '') 95 $astman->database_put("sysspeeddials",$speeddial, '"'.$number.'"'); 96 } else { 97 fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 83 84 if ($gensd == "yes"){ 85 if (empty($speeddial)) { 86 for ($nbr = 99; $nbr > 0; $nbr--) { 87 if ($astman->database_get("sysspeeddials",sprintf("%02d",$nbr))===false) { 88 $speeddial = sprintf("%02d", $nbr); 89 break; 90 } 91 } 92 } 93 } 94 $astman->database_put("cidname",$number, '"'.$name.'"'); 95 if ($speeddial != '') 96 $astman->database_put("sysspeeddials",$speeddial, '"'.$number.'"'); 97 } else { 98 fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); 99 98 100 } 99 101 } modules/branches/2.5/phonebook/page.phonebook.php
r5893 r5896 16 16 isset($_REQUEST['name'])?$name = $_REQUEST['name']:$name=''; 17 17 isset($_REQUEST['speeddial'])?$speeddial = $_REQUEST['speeddial']:$speeddial=''; 18 isset($_REQUEST['gensd'])?$gensd = $_REQUEST['gensd']:$gensd=''; 18 19 19 20 isset($_REQUEST['editnumber'])?$editnumber = $_REQUEST['editnumber']:$editnumber=''; 21 //check if we should have generate speed dial checkbox checked 20 22 21 23 $dispnum = "phonebook"; //used for switch on config.php … … 26 28 switch ($action) { 27 29 case "add": 28 phonebook_add($number, $name, $speeddial, $ needsd);30 phonebook_add($number, $name, $speeddial, $gensd); 29 31 redirect_standard(); 30 32 exit; … … 38 40 $numbers = phonebook_list(); 39 41 phonebook_del($editnumber, $numbers[$editnumber]['speeddial']); 40 phonebook_add($number, $name, $speeddial );42 phonebook_add($number, $name, $speeddial, $gensd); 41 43 redirect_standard(); 42 44 break; … … 123 125 printf('<td><a href="%s?type=tool&display=%s&number=%s&action=delete" onclick="return confirm(\'%s\')">%s</a></td>', 124 126 $_SERVER['PHP_SELF'], urlencode($dispnum), urlencode($num), _("Are you sure you want to delete this entry ?"), _("Delete")); 125 printf('<td><a href="#" onClick="theForm.number.value = \'%s\'; theForm.name.value = \'%s\' ; theForm.speeddial.value = \'%s\' ; theForm.editnumber.value = \'%s\' ; theForm.action.value = \'edit\' ; ">%s</a></td>', 127 printf('<td><a href="#" 128 onClick="theForm.number.value = \'%s\'; theForm.name.value = \'%s\' ; theForm.speeddial.value = \'%s\' ; 129 if (theForm.name.value && theForm.number.value && !theForm.speeddial.value) { theForm.gensd.checked = false } else { theForm.gensd.checked = true }; 130 theForm.editnumber.value = \'%s\' ; theForm.action.value = \'edit\' ; ">%s</a></td>', 126 131 $num, addslashes($values['name']), $values['speeddial'], $num, _("Edit")); 127 132 print('</tr>'); … … 155 160 <td><input type="text" name="name"></td> 156 161 </tr> 157 162 158 163 <tr> 159 164 <td><a href="#" class="info"><?php echo _("Number:")?> … … 161 166 <td><input type="text" name="number"></td> 162 167 </tr> 163 168 164 169 <tr> 165 170 <td><a href="#" class="info"><?php echo _("Speed dial code:")?><span><?php echo _("Enter a speed dial code<br/>Speeddial module is required to use speeddial codes")?></span></a></td> 166 171 <td><input type="text" name="speeddial"></td> 167 172 </tr> 168 173 169 174 <tr> 170 175 <td><a href="#" class="info"><?php echo _("Set Speed Dial?"); ?><span><?php echo _("Check to have a speed dial created automaticaly for this number"); ?></span></a></td> 171 <td><input type="checkbox" name=" needsd" value="true" CHECKED <?php echo $thisItem['needsd'] ?> /></td>172 </tr> 173 174 <tr> 175 <td colspan="2"><br><h6><input name="submit" type="submit" value="<?php echo _("Submit Changes")?>"></h6> 176 <td><input type="checkbox" name="gensd" value="yes" CHECKED ></td> 177 178 <tr> 179 <td colspan="2"><br><h6><input name="submit" type="submit" value="<?php echo _("Submit Changes")?>"></h6></td> 180 176 181 </tr> 177 182 </form>
