Browse Source

- Fix a warning

- Fix Vcard request in ContactSummary
- Detect Youtube video when the url is 'youtu.be'
pull/16/head
Jaussoin Timothée 12 years ago
parent
commit
08eedd9a81
  1. 12
      app/widgets/ContactSummary/ContactSummary.php
  2. 12
      app/widgets/WidgetCommon/WidgetCommon.php
  3. 2
      system/Route.php

12
app/widgets/ContactSummary/ContactSummary.php

@ -81,23 +81,21 @@ class ContactSummary extends WidgetCommon
if($_GET['f'] == $this->user->getLogin()) {
$contact = $cd->get($this->user->getLogin());
} else {
} /*else {
$contact = $cd->getRosterItem($_GET['f']);
$refresh = true;
}
}*/
if(!isset($contact)) {
$contact = $cd->get($_GET['f']);
$refresh = false;
//$refresh = false;
}
?>
<div id="contactsummary">
<?php
if($contact != null && $refresh == false) {
if($contact != null) {
echo $this->prepareContactSummary($contact);
}
if($refresh == true) {
} else {
$contact = new modl\Contact();
echo $this->prepareContactSummary($contact);
?>

12
app/widgets/WidgetCommon/WidgetCommon.php

@ -191,6 +191,16 @@ class WidgetCommon extends WidgetBase {
<img src="http://img.youtube.com/vi/'.substr($url['query'], 2, 11).'/3.jpg"/>
</a><br />';
}
if($url['host'] == 'youtu.be') {
$enc .= '
<a href="'.$l['href'].'" target="_blank">
<img src="http://img.youtube.com/vi/'.substr($url['path'], 1, 11).'/1.jpg"/>
<img src="http://img.youtube.com/vi/'.substr($url['path'], 1, 11).'/2.jpg"/>
<img src="http://img.youtube.com/vi/'.substr($url['path'], 1, 11).'/3.jpg"/>
</a><br />';
}
$enc .= '
<a href="'.$l['href'].'" class="imglink" target="_blank">
<img class="icon" src="https://duckduckgo.com/i/'.$url['host'].'.ico"/>'.$url['scheme'].'://'.$url['host'].$url['path'].'
@ -198,7 +208,7 @@ class WidgetCommon extends WidgetBase {
}
}
}
//<iframe src="http://www.youtube.com/embed/VIDEO_ID"></iframe>
return $enc;
}

2
system/Route.php

@ -80,7 +80,7 @@ class Route extends \ControllerBase {
\system\Logs\Logger::log(t('Route error, please set all the parameters for the page %s', $page));
else {
//We construct a classic URL if the rewriting is disabled
if(!isset($_SERVER['HTTP_MOD_REWRITE']) && !$_SERVER['HTTP_MOD_REWRITE']) {
if(!isset($_SERVER['HTTP_MOD_REWRITE']) || !$_SERVER['HTTP_MOD_REWRITE']) {
$uri = BASE_URI.'?q='.$page;
if($params != false && is_array($params)) {

Loading…
Cancel
Save