diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/css/voipusernumber.css b/css/voipusernumber.css new file mode 100644 index 0000000..26a0faf --- /dev/null +++ b/css/voipusernumber.css @@ -0,0 +1,9 @@ +/*CCK Field*/ +div.click2call-desc,div.click2call-script{ + float: left; + margin-right: 10px; +} + +.click2call-hidden{ +display:none; +} \ No newline at end of file diff --git a/js/voipusernumber.js b/js/voipusernumber.js new file mode 100644 index 0000000..98b445b --- /dev/null +++ b/js/voipusernumber.js @@ -0,0 +1,128 @@ +Drupal.behaviors.click2call = function (context) { + $(".hangup-button").attr('disabled', 'disabled'); + $(".click2call-hidden").hide(); + click2call_attach_events(); + $(".click2call-hangup-button").attr('disabled', 'disabled'); +} + +function click2call_attach_events(){ + //Automatically select radio when typing in textfield + $(".click2call-type").focus(function() { + $(this).prev().attr("checked","checked"); + }); + + //Automatically select radio when focusing on select list + $(".click2call-voipnumber").focus(function() { + $(this).prev().attr("checked","checked"); + }); +} + +function click2call_display(field_name,delta) { + if($("#click2call-group-"+field_name+"-"+delta).hasClass('on')){ + $("#click2call-group-"+field_name+"-"+delta).hide(); + } + else{ + $("#click2call-group-"+field_name+"-"+delta).show(); + } + + $("#click2call-group-"+field_name+"-"+delta).toggleClass('on'); +} + + +function click2call_call(field_name,delta,nid) { + //Disable the button + $("#click2call-button-"+field_name+"-"+delta).attr('disabled', 'disabled'); + //Remove error message + $("#click2call-"+field_name+"-"+delta+"-status").html(""); + //Upload button + var phone=$("#click2call-group-"+field_name+"-"+delta+" input:radio:checked").val(); + if(phone=="voipnumber"){ + //Get the phone number from select list + phone=$("#click2call-"+field_name+"-"+delta+"-select :selected").val(); + console.log('in voip number'); + console.log(phone); + } + else if(phone=="type"){ + phone=$("#click2call-"+field_name+"-"+delta+"-type-phone").val(); + console.log('in type'); + console.log(phone); + } + + //Hide the phone number selection + $("#click2call-"+field_name+"-"+delta+"-hidden").html($(".click2call-"+field_name+"-"+delta+"-phone").html()); + $(".click2call-"+field_name+"-"+delta+"-phone").html("Calling..."); + //Enable hangup button + $("#click2call-hangup-button-"+field_name+"-"+delta).removeAttr("disabled"); + $.ajax({ + type: "GET", + url: Drupal.settings.basePath +"?q=voipnumber/call", + data: "phone=" + encodeURIComponent(phone)+"&field_name="+field_name+"&delta="+delta+"&nid="+nid, + dataType: 'json', + success: function(data){ + console.log('i am in sucess'); + click2call_response(data,field_name,delta); + } + }); +} + +function click2call_hangup(field_name,delta){ + var call_nid=$("#click2call-"+field_name+"-"+delta+"-callnid").val(); + + $.ajax({ + type: "GET", + url: Drupal.settings.basePath +"?q=voipnumber/hangup", + data: "call_nid=" + call_nid, + dataType: 'json', + success: function(data){ + if(data.status){ + $(".click2call-"+field_name+"-"+delta+"-phone").html("Terminating call..."); + } + } + }); +} + +function click2call_response(data,field_name,delta){ + $("#click2call-"+field_name+"-"+delta+"-callnid").val(data.call_nid); + // Check for call status after 3 sec. + window.setTimeout(function() { + console.log('i am in responce'); + click2call_check(data.call_nid,field_name,delta); + }, 3000); + +} + +function click2call_check(call_nid,field_name,delta){ +console.log('i am in check'); +$.ajax({ + type: "GET", + url: Drupal.settings.basePath +"?q=voipnumber/get/status", + data: "call_nid=" + call_nid, + dataType: 'json', + success: function(data){ + if(data.status=="success"){ + //Call is sucess + $(".click2call-"+field_name+"-"+delta+"-phone").html($("#click2call-"+field_name+"-"+delta+"-hidden").html()); + $("#click2call-"+field_name+"-"+delta+"-hidden").html(""); + click2call_attach_events(); + $("#click2call-"+field_name+"-"+delta+"-status").html(data.message); + $("#click2call-button-"+field_name+"-"+delta).removeAttr("disabled"); + $("#click2call-hangup-button-"+field_name+"-"+delta).attr('disabled', 'disabled'); + } + else if(data.status=="failed"){ + //Call is terminated (busy, not answered, error, unavailable, ...) + $(".click2call-"+field_name+"-"+delta+"-phone").html($("#click2call-"+field_name+"-"+delta+"-hidden").html()); + $("#click2call-"+field_name+"-"+delta+"-hidden").html(""); + click2call_attach_events(); + $("#click2call-"+field_name+"-"+delta+"-status").html(data.message); + $("#click2call-button-"+field_name+"-"+delta).removeAttr("disabled"); + $("#click2call-hangup-button-"+field_name+"-"+delta).attr('disabled', 'disabled'); + } + else{ + //Call is not finished yet, check again after 2 sec. + window.setTimeout(function() { + click2call_check(call_nid,field_name,delta); + }, 2000); + } + } + }); +} diff --git a/voipusernumber.info b/voipusernumber.info index fae123a..45d4188 100644 --- a/voipusernumber.info +++ b/voipusernumber.info @@ -7,3 +7,10 @@ dependencies[] = autoload files[] = voipusernumber.voipnumber.inc package = VoIP Drupal core = 6.x + +; Information added by drupal.org packaging script on 2012-07-25 +version = "6.x-1.x-dev" +core = "6.x" +project = "voipusernumber" +datestamp = "1343177700" + diff --git a/voipusernumber.install b/voipusernumber.install index 76e8daf..6b1fc47 100644 --- a/voipusernumber.install +++ b/voipusernumber.install @@ -39,6 +39,20 @@ function voipusernumber_schema() { } /** + * Implementation of hook_update_N(). + */ +function voipusernumber_update_6100() { + $ret = array(); + db_add_field($ret, 'voipusernumber_numbers', 'source', + array( + 'type' => 'int', + 'dafault'=> '', + ) + ); + return $ret; +} + +/** * Implements hook_install(). */ function voipusernumber_install() { diff --git a/voipusernumber.module b/voipusernumber.module index 5bf2b8e..9bf6750 100644 --- a/voipusernumber.module +++ b/voipusernumber.module @@ -72,6 +72,27 @@ function voipusernumber_menu() { 'tab_parent' => 'user/%/edit/voipnumber', 'file' => 'voipusernumber.user.inc', ); + + $items['voipnumber/call'] = array( + 'title' => 'Call', + 'page callback' => 'voipusernumber_call', + 'type' => MENU_CALLBACK, + 'access arguments' => array('Edit own VoIP user number'), + ); + + $items['voipnumber/get/status'] = array( + 'title' => 'Get Call Status', + 'page callback' => 'voipusernumber_get_status', + 'type' => MENU_CALLBACK, + 'access arguments' => array('Edit own VoIP user number'), + ); + + $items['voipnumber/hangup'] = array( + 'title' => 'Hangup', + 'page callback' => 'voipusernumber_hangup', + 'type' => MENU_CALLBACK, + 'access arguments' => array('Edit own VoIP user number'), + ); return $items; } @@ -133,6 +154,7 @@ function voipusernumber_user_load(&$account, $category) { * @todo seperate insert, update; keep common together. */ function voipusernumber_user_save(&$edit, &$account, $category) { +/** if (($category == 'voipnumber' || $category == 'account') && $edit['voipnumber']) { $numbers = $edit['voipnumber']; db_query('DELETE FROM {voipusernumber_numbers} WHERE uid = %d', $account->uid); @@ -149,6 +171,7 @@ function voipusernumber_user_save(&$edit, &$account, $category) { drupal_write_record($number); } } + **/ } /** @@ -247,6 +270,7 @@ function voipusernumber_user_create($number, $options = array()) { 'number' => $number, 'status' => $options['number_status'], 'number_prefix' => $options['number_prefix'], + 'source'=>'', ), ), )); @@ -265,6 +289,7 @@ function voipusernumber_voipscript_get_script_names() { return array( 'voipusernumber_autologin', 'voipusernumber_logout', + 'voipusernumber_ask_pin', ); } @@ -284,6 +309,9 @@ function voipusernumber_voipscript_load_script($script_name, $params = NULL) { case 'voipusernumber_logout': module_load_include('inc', 'voipusernumber', 'voipusernumber.script'); return _voipusernumber_logout_script(); + case 'voipusernumber_ask_pin': + module_load_include('inc', 'voipusernumber', 'voipusernumber.script'); + return _voipusernumber_ask_pin($params['number'],$params['uid']); } } @@ -318,3 +346,295 @@ function voipusernumber_get_voip_numbers($id, $type) { break; } } + +/** + *Basic validation + */ +function voipusernumber_validate(){ + global $user; +$error = ''; +$number=$_GET['phone']; + $uid=VoipUserNumber::getUidFromNumber($number); + // Basic VoIPNumber validation. + _voipnumber_valid_int_phone_number($number, $error); + if (! empty($error)) { + return FALSE; + + } + // Unique validation. + elseif ($uid==$user->uid) { + watchdog('voipusernumber','phone exist @number',array('@number'=>$number),watchdog_error); + return FALSE; + + } + else { + watchdog('voipusernumber','validation pass @number',array('@number'=>$number),watchdog_error); + return TRUE; + } +} + +/** + *Phone number is saved in database just after the pin matches. + */ +function voipusernumber_writerecord($number,$uid) { +// if the phone number is already register via phone. + $result = db_query('select ifnull(uid,0) uid FROM {voipusernumber_numbers} where phone=%s and source=%d',$number,0); + while ($record = db_fetch_object($result)) { + $uidtomerge = $record->uid; + } + if($uidtomerge != '') { + voipusernumber_do_user_merge($uid,$uidtomerge); + watchdog('voipusernumber', 'User merge has been done successfully @uid' , array('uid'=>$uid)); + $voipnumber = new VoipUserNumber($number, $uid,1,1,1); + drupal_write_record('voipusernumber_numbers', $voipnumber); + $account->voipnumber[$voipnumber->getNumber()] = $voipnumber; + } + else { +// if the phone number is owned by some other user. + $sql= db_query('select uid from {voipusernumber_numbers} where phone=%d and source=%d and uid !=%d',$number,1,$uid); + while ($record = db_fetch_object($result)) { + $uidtodelete = $record->uid; + } + if ($uidtodelete != ''){ + voipusernumber_delete_number($number,$uidtodelete); + } + watchdog('voipusernumber', 'User Phone number has been added successfully @uid' , array('uid'=>$uid)); + $voipnumber = new VoipUserNumber($number, $uid,1,1,1); + drupal_write_record('voipusernumber_numbers', $voipnumber); + $account->voipnumber[$voipnumber->getNumber()] = $voipnumber; + } +} + +/** + * The funtion to do the merge. + * @param object $uid + * The user that will be merged and retained. + * @param object $uidtomerge + * The user that will be merged and blocked. + */ +function voipusernumber_do_user_merge($uid, $uidtomerge) { + module_invoke_all('user_merge', $uidtomerge, $uid); +} + +/** + * Implement hook_usermerge_merge_users(). + */ +function voipusernumber_user_merge($uidtomerge, $uid) { + // Comment: change the uid to the new one. + db_query('UPDATE {comments} SET uid = %d where uid = %d', $uid->uid, $uidtomerge->uid); + + // Node: change uid of node and revisions to the new one. + db_query('UPDATE {node} SET uid = %d where uid = %d', $uid->uid, $uidtomerge->uid); + db_query('UPDATE {node_revisions} SET uid = %d where uid = %d', $uid->uid, $uidtomerge->uid); + + //Update roles. + $merged_roles = $uid->roles + $uidtomerge->roles; + + // First, remove all roles from the user to keep to prevent duplicate key errors. + db_query("DELETE FROM {users_roles} WHERE uid = %d", $uid->uid); + // Then add them on to the user to keep. + foreach (array_keys($merged_roles) as $rid) { + if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))){ + db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $uid->uid, $rid); + } + } + // Block the old user. + user_block_user_action($uidtomerge); +} + +/** + * Implement hook_usermerge_merge_users() on behalf of og. + */ +function og_user_merge($uidtomerge, $uid) { + // Get groups kept-user is not a member of but blocked-user is. + $result = db_query("SELECT nid FROM {og_uid} WHERE uid = %d AND nid NOT IN (SELECT nid FROM {og_uid} WHERE uid = %d)", $uidtomerge->uid, $uid->uid); + while ($record = db_fetch_array($result)) { + $groups[] = $record['nid']; + } + if (!empty($groups)) { + // Update old user's groups to kept-user if kept-user is not already a member. + db_query("UPDATE {og_uid} SET uid = %d WHERE uid = %d AND nid IN (%s)", $uid->uid, $uidtomerge->uid, implode(',', $groups)); + } + // Set blocked-user to inactive. + db_query("UPDATE {og_uid} SET is_active = 0 WHERE uid = %d", $uidtomerge->uid); +} + +/** + * Implement hook_usermerge_merge_users() on behalf of notifications. + */ +function notifications_usermerge_merge_users($uidtomerge, $uid) { + // Get blocked-user's notifications. + $blocked = array(); + $result = db_query("SELECT sid FROM {notifications} WHERE uid = %d". $uidtomerge->uid); + while ($record = db_fetch_array($result)) { + $blocked[] = $record['sid']; + } + if (!empty($blocked)) { + // Delete notification settings. + db_query("DELETE FROM {notifications} WHERE uid = %d", $uidtomerge->uid); + // Delete fields of blocked-user's notifications settings, they aren't used. + db_query("DELETE FROM {notifications_fields} WHERE sid IN (%s)", implode(',', $blocked)); + } + // Delete notifications in the queue for blocked-user. + db_query("DELETE FROM {notifications_queue} WHERE uid = %d", $uidtomerge->uid); +} + +/** + * The function respomsible for making calls + * @see voipusernumber_validate() + * @see hook_menu + */ +function voipusernumber_call() { + global $user; + $val= voipusernumber_validate(); + if($val == FALSE) { + return ; + } + if (empty($_GET['phone']) || empty($_GET['field_name'])) { + return; + } + if($_GET['field_name'] == 'user') { + variable_set('form_number', $_GET['phone']); + $caller_uid = $_GET['delta']; + $caller = user_load($caller_uid); + $name = $caller->name; + $script_name= 'voipusernumber_ask_pin'; + $caller_name = $caller->name; + $number=$_GET['phone']; + $uid= $user->uid; + $vars = array('uid' => $user->uid, 'name' => $name, 'number' => $number, 'caller_uid' => $caller_uid); + $script = VoipScript::loadScript($script_name,$vars); + + $call = new VoipCall(); + $call->setDestNumber($number); + $call->setDestName($user->name); + $call->setCallerName($caller_name); + $call->setScript($script); + $call->save(); + // Dial the call. + $result = voip_dial($call); + // Log call with watchdog + $type = 'voipusernumber'; + $message = t("New Call had been recorded by $user->name to phone $number. See voipcall nid " . $call->getCid()); + watchdog($type, $message); + + $rc = drupal_json(array('call_nid' =>$call->getCid())); + return $rc; + exit(); + } +} + +/** + * Get the status of the call + */ +function voipusernumber_get_status() { + global $user; + $call_nid=$_GET['call_nid']; + $call = VoipCall::load($call_nid); + //Check for status only if call is finished + if ($call->isHangup()==TRUE) { + if ($call->getCallStatus() != VoipCall::COMPLETED) { + if ($call->getCallStatus() == VoipCall::ERROR) { + $failed_message='
' . $call->getErrorMessage() . '
'; + } + elseif ($call->getCallStatus()=='to_hangup' || $call->getCallStatus() == VoipCall::CANCELED) { + //We display message for all statuses except hangup + $failed_message='
' . $call->getCallStatusDescription() . '
'; + } + else { + $failed_message='
' . $call->getCallStatusDescription() . '
'; + } + $rc = drupal_json(array('status' => 'failed', 'message' => $failed_message)); + return $rc; + exit(); + } +#Else: + $message='
' . $call->getCallStatusDescription() . '
'; + $rc = drupal_json(array('status' => 'success' , 'message' => $message)); + return $rc; + exit(); + } + else { + $rc = drupal_json(array('status' => 'calling')); + return $rc; + } + exit(); +} + +/** + * Function to hungup the call + */ +function voipusernumber_hangup() { + $voipcall_nid = $_GET['call_nid']; + $call = VoipCall::load($voipcall_nid); + $status = voip_hangup($call); + $rc = drupal_json(array('status' => $status)); + return $rc; + exit(); +} + +/* + *Retrieve and theme phone numbers selection +*/ +function theme_voipusernumber_phone_numbers($field_name, $delta, $content_type) { + global $user; + $field_settings=content_fields($field_name, $content_type); + if (empty($field_settings)) { + $op = variable_get('click2call_number', array('type')); + } + else { + $op = $field_settings['click2call_number']; + } + foreach ($op as $key => $call_option) { + if ($call_option===0) { + unset($op[$key]); + } + } + $num=count($op); + if ($num==1 || $user->uid==0) { + //If only one choice is available or user is anonymous then make the option preselected + $checked='checked="checked"'; + } + foreach ($op as $call_option) { + switch ($call_option) { + case 'default': + if (module_exists('voipnumber')) { + $phone = VoipNumber::getDefaultNumberFromUid(); + if (empty($phone)) { + if ($num==2) { + //If only 2 choices are available then make the other selected + $checked='checked="checked"'; + } + } + else { + $option .= 'Default (' . $phone->getNumber() . ')
'; + } + } + break; + + case 'type': + $option=''; + $option .= '
'; + break; + + case 'voipnumber': + if (module_exists('voipnumber')) { + $numbers = VoipNumber::getNumbersFromUid(); + //Numbers could be empty, check. + if (empty($numbers)) { + continue; + } + $option .= ''; + $option .= '
'; + } + break; + } + } + $output=''; + $output .= '
' . $option . '
'; + return $output; +} diff --git a/voipusernumber.script.inc b/voipusernumber.script.inc index bd1fcbc..9f5d29c 100644 --- a/voipusernumber.script.inc +++ b/voipusernumber.script.inc @@ -75,3 +75,42 @@ function _voipusernumber_logout_script() { $script->addSet('user_name', $user->name); return $script; } + +/* + * Script to verify pin, if the pin matches phone no. is added + */ +function _voipusernumber_ask_pin($number,$uid) { + $form_pin= variable_get('pin_variable_ask',''); + $script = new VoipScript('voipusernumber_ask_pin'); + $script->addSet('number',$number); + $script->addSet('uid',$uid); + +// welcome script + $script->addLabel('welcome'); + $script->addSay('welcome to voxvox'); + $script->addGoto('getpin'); + +// get pin script + $script->addLabel('getpin'); + $prompt = 'Please enter the 4 digit Pin on screen, and press pound key to confirm.'; + $script->addGetInput($prompt,4, '#' ,5); + $script->addSet('pin',"%input_digits"); + $script->addSay(v('you entered %pin')); + +//call a drupal function to vaildate the pin provided by the phone user + $script->addGotoIf('success_message', "^%input_digits == $form_pin"); + $script->addGotoIf('invalid_pin', "^%input_digits == ''"); + +// Invalid pin messages. + $script->addLabel('invalid_pin'); + $script->addSay('Invalid Pin number please try again.'); + $script->addGoto('getpin'); + +// Correct pin given message. + $script->addLabel('success_message'); + $script->addSet('success','^voipusernumber_writerecord(%number,%uid)'); + $script->addSay('Thank you. Phone number %number is successfully added '); + $script->addHangup(); + + return $script; +} diff --git a/voipusernumber.user.inc b/voipusernumber.user.inc index 84c99fc..ced999b 100644 --- a/voipusernumber.user.inc +++ b/voipusernumber.user.inc @@ -86,51 +86,57 @@ function voipusernumber_settings_numbers_form(&$form_state, $account) { */ function voipusernumber_settings_add_form(&$form_state, $account) { $form = array(); + $pin = rand(1000,9999); $form['uid'] = array('#type' => 'value', '#value' => $account->uid); - // would be good to have a standard (outside CCK implementation of voipnumber - // elements? - $form['add']['number'] = array( - '#type' => 'textfield', - '#title' => t('Phone number'), - '#default_value' => '', // do we ever want one - '#required' => TRUE, + $form['add']['phone'] = array( + '#type' => 'item', + '#value' => l(t('List of your phone numbers'), 'user/' . $account->uid . '/edit/voipnumber'), ); - $form['add']['submit'] = array( - '#type' => 'submit', - '#value' => t('Add'), + $form['add']['pin'] = array( + '#type' => 'item', + '#title' => t('Pin'), + '#description' => t('Enter the pin when asked during call verification.'), + '#value' => $pin, ); + $form['add']['numbers'] = array( + '#type' => 'item', + '#title' => t('Verify your phone number'), + '#value' => _voipusernumber_user_user_view($account), + ); + variable_set('pin_variable_ask', $form['add']['pin']['#value']); return $form; } - -/** - * Form validation handler for voipusernumber_settings_add_form(). - * - * @see voipusernumber_settings_add_form_submit(). - */ -function voipusernumber_settings_add_form_validate($form, &$form_state) { - $error = ''; - // Basic VoIPNumber validation. - _voipnumber_valid_int_phone_number($form_state['values']['number'], $error); - if (! empty($error)) { - form_set_error('number', t('Phone number is %error', array('%error' => $error))); - } - // Unique validation. - if (VoipUserNumber::getUidFromNumber($form_state['values']['number'])) { - form_set_error('number', t('Phone number is already registered.')); - } -} - /** - * Form submission handler for voipusernumber_settings_add_form(). - * - * @see voipusernumber_settings_add_form_validate(). + *Click2call Field implementation */ -function voipusernumber_settings_add_form_submit($form, &$form_state) { - $voipnumber = new VoipUserNumber($form_state['values']['number'], $form_state['values']['uid']); - drupal_write_record('voipusernumber_numbers', $voipnumber); - $account->voipnumber[$voipnumber->getNumber()] = $voipnumber; +function _voipusernumber_user_user_view($account) { + + drupal_add_js(drupal_get_path('module', 'voipusernumber') . '/js/voipusernumber.js'); + drupal_add_css(drupal_get_path('module', 'voipusernumber') . '/css/voipusernumber.css'); + + $field_name='user'; + $delta=$account->uid; //Delta is uid of callee + $script_desc= 'Click here to call'; + + $output='' . $script_desc . ''; + $output .= '
'; + //Hidden div to store the phone list + $output .= '
'; + //Hidden div to store the call status in case of error + $output .= '
'; + //Hidden input to store the call nid. + $output .= ''; + $output .= theme('voipusernumber_phone_numbers', $field_name, $delta, ''); + //Call/Remove button + $output .= ''; + + + //Hangup button + $output .= ''; + $output .= '
'; + return $output; } /**