diff -ruN trunk/opt/gemeinschaft/dialplan-scripts/in-user-get-ringer.agi trunk_ringtones/opt/gemeinschaft/dialplan-scripts/in-user-get-ringer.agi --- trunk/opt/gemeinschaft/dialplan-scripts/in-user-get-ringer.agi 2009-07-17 07:56:54.000000000 +0000 +++ trunk_ringtones/opt/gemeinschaft/dialplan-scripts/in-user-get-ringer.agi 2009-07-21 12:07:16.000000000 +0000 @@ -90,7 +90,7 @@ if (! ($user = $rs->fetchRow())) exit(0); # not an error -function _get_ringers() +function _get_ringers( $user ) { /* $ringtones = gs_ringtones_get( $uname ); @@ -105,6 +105,12 @@ 'external' => array( 'bellcore' => 1, 'file' => null ) ); + $db = gs_db_slave_connect(); + if (! $db) { + @gs_agi_verbose( '### DB error - Failed to connect' ); + exit(1); + } + $rs = $db->execute( 'SELECT `src`, `bellcore`, `file` FROM `ringtones` WHERE `user_id`='. $user['id'] ); if (! $rs) { @gs_agi_verbose( '### DB error - Failed to get ringtones' ); @@ -123,7 +129,7 @@ if (strToLower(subStr($user['phone_type'],0,4)) === 'snom') { - $ringtones = _get_ringers(); + $ringtones = _get_ringers( $user ); if (@$ringtones['internal']['file'] && @$ringtones['external']['file']) $ringtones['external']['file'] = null; @@ -145,7 +151,7 @@ //FIXME // Siemens OpenStage does not support Alert-Info headers (yet) - $ringtones = _get_ringers(); + $ringtones = _get_ringers( $user ); if (@$ringtones['internal']['file'] && @$ringtones['external']['file']) $ringtones['external']['file'] = null; @@ -164,7 +170,7 @@ //FIXME - untested - $ringtones = _get_ringers(); + $ringtones = _get_ringers( $user ); if (@$ringtones['internal']['file'] && @$ringtones['external']['file']) $ringtones['external']['file'] = null; @@ -181,7 +187,7 @@ } elseif (strToLower(subStr($user['phone_type'],0,11)) === 'grandstream') { - $ringtones = _get_ringers(); + $ringtones = _get_ringers( $user ); if (@$ringtones['internal']['file'] && @$ringtones['external']['file']) $ringtones['external']['file'] = null;