Skip to content

Commit

Permalink
Fix for conversations of contacts not showing any messages (#302)
Browse files Browse the repository at this point in the history
  • Loading branch information
@codeling @e-alfred
codeling authored and e-alfred committed Oct 11, 2019
1 parent dcd1d29 commit 7a23294
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions db/smsmapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,16 @@ public function getAllPhoneNumbersForFPN ($userId, $phoneNumber, $country) {
}
$phoneList[$fmtPN][$pn] += 1;
}
$fpn = PhoneNumberFormatter::format($country, $phoneNumber);
if(isset($phoneList[$fpn])){
$fpn = $phoneNumber;
if(isset($phoneList[$fpn])) {
return $phoneList[$fpn];
}
else {
$fpn = PhoneNumberFormatter::format($country, $fpn);
if (isset($phoneList[$fpn])) {
return $phoneList[$fpn];
}
}
else {
return array();
}
Expand Down

3 comments on commit 7a23294

@dagobert
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change broke the plugin.

Line 145 is an else that does not have an if. The resulting error when accessing on Nextcloud:

The server was unable to complete your request.

If this happens again, please send the technical details below to the server administrator.

More details can be found in the server log.
Technical details

    Remote Address: xxx.xxx.xxx.xxx
    Request ID: p7C0gzkxXhuImlVYfWUa
    Type: ParseError
    Code: 0
    Message: syntax error, unexpected 'else' (T_ELSE)
    File: /var/www/clients/client3/web96/web/apps/ocsms/db/smsmapper.php
    Line: 145


Trace

#0 [internal function]: OC\Autoloader->load('OCA\\OcSms\\Db\\Sm...')
#1 /var/www/clients/client3/web96/web/apps/ocsms/appinfo/ocsmsapp.php(71): spl_autoload_call('OCA\\OcSms\\Db\\Sm...')
#2 /var/www/clients/client3/web96/web/3rdparty/pimple/pimple/src/Pimple/Container.php(118): OCA\OcSms\AppInfo\OcSmsApp->OCA\OcSms\AppInfo\{closure}(Object(OC\AppFramework\DependencyInjection\DIContainer))
#3 /var/www/clients/client3/web96/web/lib/private/AppFramework/Utility/SimpleContainer.php(117): Pimple\Container->offsetGet('SmsMapper')
#4 /var/www/clients/client3/web96/web/lib/private/AppFramework/DependencyInjection/DIContainer.php(404): OC\AppFramework\Utility\SimpleContainer->query('SmsMapper')
#5 /var/www/clients/client3/web96/web/lib/private/AppFramework/DependencyInjection/DIContainer.php(382): OC\AppFramework\DependencyInjection\DIContainer->queryNoFallback('SmsMapper')
#6 /var/www/clients/client3/web96/web/apps/ocsms/appinfo/ocsmsapp.php(100): OC\AppFramework\DependencyInjection\DIContainer->query('SmsMapper')
#7 /var/www/clients/client3/web96/web/3rdparty/pimple/pimple/src/Pimple/Container.php(118): OCA\OcSms\AppInfo\OcSmsApp->OCA\OcSms\AppInfo\{closure}(Object(OC\AppFramework\DependencyInjection\DIContainer))
#8 /var/www/clients/client3/web96/web/lib/private/AppFramework/Utility/SimpleContainer.php(117): Pimple\Container->offsetGet('SmsController')
#9 /var/www/clients/client3/web96/web/lib/private/AppFramework/DependencyInjection/DIContainer.php(404): OC\AppFramework\Utility\SimpleContainer->query('SmsController')
#10 /var/www/clients/client3/web96/web/lib/private/AppFramework/DependencyInjection/DIContainer.php(382): OC\AppFramework\DependencyInjection\DIContainer->queryNoFallback('SmsController')
#11 /var/www/clients/client3/web96/web/lib/private/AppFramework/App.php(97): OC\AppFramework\DependencyInjection\DIContainer->query('SmsController')
#12 /var/www/clients/client3/web96/web/lib/private/AppFramework/Routing/RouteActionHandler.php(47): OC\AppFramework\App::main('SmsController', 'index', Object(OC\AppFramework\DependencyInjection\DIContainer), Array)
#13 [internal function]: OC\AppFramework\Routing\RouteActionHandler->__invoke(Array)
#14 /var/www/clients/client3/web96/web/lib/private/Route/Router.php(297): call_user_func(Object(OC\AppFramework\Routing\RouteActionHandler), Array)
#15 /var/www/clients/client3/web96/web/lib/base.php(975): OC\Route\Router->match('/apps/ocsms/')
#16 /var/www/clients/client3/web96/web/index.php(42): OC::handleRequest()
#17 {main}

@mjdubbs
Copy link

@mjdubbs mjdubbs commented on 7a23294 Nov 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed same behavior.
Will you create an issue @dagobert ?

@nerzhul
Copy link
Collaborator

@nerzhul nerzhul commented on 7a23294 Nov 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

exact, i missed that point on the review

Please sign in to comment.