Changeset 4640
- Timestamp:
- 08/02/07 13:12:22 (1 year ago)
- Files:
-
- modules/branches/2.3/findmefollow/functions.inc.php (modified) (6 diffs)
- modules/branches/2.3/findmefollow/install.php (modified) (2 diffs)
- modules/branches/2.3/findmefollow/install.sql (modified) (1 diff)
- modules/branches/2.3/findmefollow/module.xml (modified) (2 diffs)
- modules/branches/2.3/findmefollow/page.findmefollow.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3/findmefollow/functions.inc.php
r4312 r4640 187 187 global $astman; 188 188 189 $sql = "INSERT INTO findmefollow (grpnum, strategy, grptime, grppre, grplist, annmsg, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring) VALUES ( ".$grpnum.", '".str_replace("'", "''", $strategy)."', ".str_replace("'", "''", $grptime).", '".str_replace("'", "''", $grppre)."', '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $annmsg)."', '".str_replace("'", "''", $postdest)."', '".str_replace("'", "''", $dring)."', '$needsconf', '$remotealert', '$toolate', '$ringing', '$pre_ring')";189 $sql = "INSERT INTO findmefollow (grpnum, strategy, grptime, grppre, grplist, annmsg, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring) VALUES ('".str_replace("'", "''",$grpnum)."', '".str_replace("'", "''", $strategy)."', ".str_replace("'", "''", $grptime).", '".str_replace("'", "''", $grppre)."', '".str_replace("'", "''", $grplist)."', '".str_replace("'", "''", $annmsg)."', '".str_replace("'", "''", $postdest)."', '".str_replace("'", "''", $dring)."', '$needsconf', '$remotealert', '$toolate', '$ringing', '$pre_ring')"; 190 190 $results = sql($sql); 191 191 … … 211 211 global $astman; 212 212 213 $results = sql("DELETE FROM findmefollow WHERE grpnum = $grpnum","query");213 $results = sql("DELETE FROM findmefollow WHERE grpnum = '".str_replace("'", "''", $grpnum)."'","query"); 214 214 215 215 if ($astman) { … … 221 221 222 222 function findmefollow_full_list() { 223 $results = sql("SELECT grpnum FROM findmefollow ORDER BY grpnum","getAll",DB_FETCHMODE_ASSOC);223 $results = sql("SELECT grpnum FROM findmefollow ORDER BY CAST(grpnum as UNSIGNED)","getAll",DB_FETCHMODE_ASSOC); 224 224 foreach ($results as $result) { 225 225 if (isset($result['grpnum']) && checkRange($result['grpnum'])) { … … 236 236 237 237 global $db; 238 $sql = "SELECT grpnum FROM findmefollow ORDER BY grpnum";238 $sql = "SELECT grpnum FROM findmefollow ORDER BY CAST(grpnum as UNSIGNED)"; 239 239 $results = $db->getCol($sql); 240 240 if(DB::IsError($results)) { … … 293 293 global $astman; 294 294 295 $results = sql("SELECT grpnum, strategy, grptime, grppre, grplist, annmsg, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring FROM findmefollow WHERE grpnum = $grpnum","getRow",DB_FETCHMODE_ASSOC);295 $results = sql("SELECT grpnum, strategy, grptime, grppre, grplist, annmsg, postdest, dring, needsconf, remotealert, toolate, ringing, pre_ring FROM findmefollow WHERE grpnum = '".str_replace("'", "''", $grpnum)."'","getRow",DB_FETCHMODE_ASSOC); 296 296 297 297 if ($check_astdb) { … … 349 349 $sql = "UPDATE findmefollow SET grptime = '".$results['grptime']."', grplist = '". 350 350 str_replace("'", "''", trim($results['grplist']))."', pre_ring = '".$results['pre_ring']. 351 "', needsconf = '".$results['needsconf']."' WHERE grpnum = $grpnumLIMIT 1";351 "', needsconf = '".$results['needsconf']."' WHERE grpnum = '".str_replace("'", "''", $grpnum)."' LIMIT 1"; 352 352 $sql_results = sql($sql); 353 353 } modules/branches/2.3/findmefollow/install.php
r4158 r4640 51 51 $new_dest = merge_ext_followme(trim($old_dest)); 52 52 if ($new_dest != $old_dest) { 53 $sql = "UPDATE findmefollow SET postdest = '$new_dest' WHERE grpnum = $grpnumAND postdest = '$old_dest'";53 $sql = "UPDATE findmefollow SET postdest = '$new_dest' WHERE grpnum = '$grpnum' AND postdest = '$old_dest'"; 54 54 $results = $db->query($sql); 55 55 if(DB::IsError($results)) { … … 91 91 } 92 92 93 // Version 2.4.13 change (#1961) 94 // 95 $results = $db->query("ALTER TABLE `findmefollow` CHANGE `grpnum` `grpnum` VARCHAR( 20 ) NOT NULL"); 96 if(DB::IsError($results)) { 97 echo $results->getMessage(); 98 return false; 99 } 100 93 101 ?> modules/branches/2.3/findmefollow/install.sql
r4102 r4640 1 1 2 CREATE TABLE IF NOT EXISTS `findmefollow` ( `grpnum` BIGINT( 11) NOT NULL , `strategy` VARCHAR( 50 ) NOT NULL , `grptime` SMALLINT NOT NULL , `grppre` VARCHAR( 100 ) NULL , `grplist` VARCHAR( 255 ) NOT NULL , `annmsg` VARCHAR( 255 ) NULL , `postdest` VARCHAR( 255 ) NULL , `dring` VARCHAR ( 255 ) NULL , remotealert VARCHAR ( 80 ), needsconf VARCHAR ( 10 ), toolate VARCHAR ( 80 ), pre_ring SMALLINT NOT NULL DEFAULT 0, PRIMARY KEY (`grpnum`) ) TYPE = MYISAM ;2 CREATE TABLE IF NOT EXISTS `findmefollow` ( `grpnum` VARCHAR( 20 ) NOT NULL , `strategy` VARCHAR( 50 ) NOT NULL , `grptime` SMALLINT NOT NULL , `grppre` VARCHAR( 100 ) NULL , `grplist` VARCHAR( 255 ) NOT NULL , `annmsg` VARCHAR( 255 ) NULL , `postdest` VARCHAR( 255 ) NULL , `dring` VARCHAR ( 255 ) NULL , remotealert VARCHAR ( 80 ), needsconf VARCHAR ( 10 ), toolate VARCHAR ( 80 ), pre_ring SMALLINT NOT NULL DEFAULT 0, PRIMARY KEY (`grpnum`) ) TYPE = MYISAM ; 3 3 modules/branches/2.3/findmefollow/module.xml
r4313 r4640 2 2 <rawname>findmefollow</rawname> 3 3 <name>Follow Me</name> 4 <version>2.4.1 2.3</version>4 <version>2.4.13</version> 5 5 <changelog> 6 *2.4.13* added xml attribute needsenginedb, #1961 enabled to work with extension numbers leading with 0s 6 7 *2.4.12.3* #2057 don't strip CID prefix if no prefix is being added 7 8 *2.4.12.2* merge findmefollow/core extension destinations if any, and remove findmefollow destinations as a destination since they are handled by core … … 38 39 </description> 39 40 <menuitems> 40 <findmefollow >Follow Me</findmefollow>41 <findmefollow needsenginedb="yes">Follow Me</findmefollow> 41 42 </menuitems> 42 43 <location>release/2.3/findmefollow-2.4.12.3.tgz</location> modules/branches/2.3/findmefollow/page.findmefollow.php
r3894 r4640 125 125 // We need to populate grplist with the existing extension list. 126 126 $thisgrp = findmefollow_get(ltrim($extdisplay,'GRP-'), 1); 127 $grpliststr = $thisgrp['grplist'];127 $grpliststr = isset($thisgrp['grplist']) ? $thisgrp['grplist'] : ''; 128 128 $grplist = explode("-", $grpliststr); 129 $strategy = $thisgrp['strategy']; 130 $grppre = $thisgrp['grppre']; 131 $grptime = $thisgrp['grptime']; 132 $goto = $thisgrp['postdest']; 133 $annmsg = $thisgrp['annmsg']; 134 $dring = $thisgrp['dring']; 135 $remotealert = $thisgrp['remotealert']; 136 $needsconf = $thisgrp['needsconf']; 137 $toolate = $thisgrp['toolate']; 138 $ringing = $thisgrp['ringing']; 139 $pre_ring = $thisgrp['pre_ring']; 140 $ddial = $thisgrp['ddial']; 129 130 $strategy = isset($thisgrp['strategy']) ? $thisgrp['strategy'] : ''; 131 $grppre = isset($thisgrp['grppre']) ? $thisgrp['grppre'] : ''; 132 $grptime = isset($thisgrp['grptime']) ? $thisgrp['grptime'] : ''; 133 $goto = isset($thisgrp['postdest']) ? $thisgrp['postdest'] : ''; 134 $annmsg = isset($thisgrp['annmsg']) ? $thisgrp['annmsg'] : ''; 135 $dring = isset($thisgrp['dring']) ? $thisgrp['dring'] : ''; 136 $remotealert = isset($thisgrp['remotealert']) ? $thisgrp['remotealert'] : ''; 137 $needsconf = isset($thisgrp['needsconf']) ? $thisgrp['needsconf'] : ''; 138 $toolate = isset($thisgrp['toolate']) ? $thisgrp['toolate'] : ''; 139 $ringing = isset($thisgrp['ringing']) ? $thisgrp['ringing'] : ''; 140 $pre_ring = isset($thisgrp['pre_ring']) ? $thisgrp['pre_ring'] : ''; 141 $ddial = isset($thisgrp['ddial']) ? $thisgrp['ddial'] : ''; 141 142 unset($grpliststr); 142 143 unset($thisgrp); … … 374 375 function checkGRP(theForm) { 375 376 var msgInvalidGrpNum = "<?php echo _('Invalid Group Number specified'); ?>"; 376 var msgInvalidGrpNumStartWithZero = "<?php echo _('Group numbers with more than one digit cannot begin with 0'); ?>";377 377 var msgInvalidExtList = "<?php echo _('Please enter an extension list.'); ?>"; 378 378 var msgInvalidGrpPrefix = "<?php echo _('Invalid prefix. Valid characters: a-z A-Z 0-9 : _ -'); ?>";
