diff --git a/www/client/answer.php b/www/client/answer.php index 023bcf8434..0d14567ccc 100644 --- a/www/client/answer.php +++ b/www/client/answer.php @@ -14,35 +14,34 @@ * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ - /* @var $Core \Alchemy\Phrasea\Core */ require_once __DIR__ . "/../../lib/bootstrap.php"; -$Core= \bootstrap::getCore(); -$appbox = appbox::get_instance($Core); -$session = $appbox->get_session(); +$Core = \bootstrap::getCore(); +$appbox = appbox::get_instance($Core); +$session = $appbox->get_session(); $registry = $appbox->get_registry(); -$user = $Core->getAuthenticatedUser(); +$user = $Core->getAuthenticatedUser(); if (!isset($parm)) { $request = http_request::getInstance(); - $parm = $request->get_parms("mod", "bas" - , "pag" - , "qry", "search_type", "recordtype" - , "qryAdv", 'opAdv', 'status', 'datemin', 'datemax' - , 'dateminfield', 'datemaxfield' - , 'datefield' - , 'sort' - , 'stemme' - , 'infield' - , "nba" - , "regroup" // si rech par doc, regroup ,ou pizza - , "ord" + $parm = $request->get_parms("mod", "bas" + , "pag" + , "qry", "search_type", "recordtype" + , "qryAdv", 'opAdv', 'status', 'datemin', 'datemax' + , 'dateminfield', 'datemaxfield' + , 'datefield' + , 'sort' + , 'stemme' + , 'infield' + , "nba" + , "regroup" // si rech par doc, regroup ,ou pizza + , "ord" ); } -$qry = ''; +$qry = ''; if (trim($parm['qry']) != '') { @@ -88,7 +87,7 @@ else $mod_row = (int) ($mod[0]); $mod_col = (int) ($mod[1]); } -$mod_xy = $mod_col * $mod_row; +$mod_xy = $mod_col * $mod_row; $tbases = array(); @@ -102,9 +101,9 @@ $options->set_bases($parm['bas'], $user->ACL()); if (!is_array($parm['infield'])) $parm['infield'] = array(); -foreach($parm['infield'] as $offset=>$value) +foreach ($parm['infield'] as $offset => $value) { - if(trim($value) === '') + if (trim($value) === '') unset($parm['infield'][$offset]); } @@ -162,8 +161,8 @@ if ($registry->get('GV_thesaurus')) if ($registry->get('GV_clientAutoShowProposals')) { ?> - if("proposals), "JS") ?>" != "
") - chgOng(4); + if("proposals), "JS") ?>" != "
") + chgOng(4); @@ -178,14 +177,14 @@ $history = queries::history(); echo ''; $nbanswers = $result->get_count_available_results(); -$longueur = strlen($parm['qry']); +$longueur = strlen($parm['qry']); $qrys = '
' . _('client::answers: rapport de questions par bases') . '
'; foreach ($qrySbas as $sbas => $qryBas) $qrys .= '
' . phrasea::sbas_names($sbas) . '
' . $qryBas . '
'; -$txt = "" . substr($parm['qry'], 0, 36) . ($longueur > 36 ? "..." : "") . "" . sprintf(_('client::answers: %d reponses'), (int) $nbanswers) . "  "; +$txt = "" . substr($parm['qry'], 0, 36) . ($longueur > 36 ? "..." : "") . "" . sprintf(_('client::answers: %d reponses'), (int) $nbanswers) . "  "; ?> get_total_pages(); -$pages = ''; -$ecart = 3; -$max = (2 * $ecart) + 3; +$pages = ''; +$ecart = 3; +$max = (2 * $ecart) + 3; if ($npages > $max) { - for ($p = 1; $p < $npages; $p++) + for ($p = 1; $p <= $npages; $p++) { if ($p == $page) $pages .= '' . ($p) . ''; @@ -217,23 +216,23 @@ if ($npages > $max) $pages .= '' . ($p) . '...'; if (($p == $page) - || ( ( $p >= ($page - $ecart) ) && ( $p <= ($page + $ecart) )) - || ( ($page < ($ecart + 2)) && ($p < ($max - $ecart + 2) ) ) - || ( ($page >= ($npages - $ecart - 2)) && ($p >= ($npages - (2 * $ecart) - 2) ) ) - || ( $p == 0) + || ( ( $p >= ($page - $ecart) ) && ( $p <= ($page + $ecart) )) + || ( ($page < ($ecart + 2)) && ($p < ($max - $ecart + 2) ) ) + || ( ($page >= ($npages - $ecart - 2)) && ($p >= ($npages - (2 * $ecart) - 2) ) ) + || ( $p == 0) ) $pages .= ' - '; } } else { - for ($p = 1; $p < $npages; $p++) + for ($p = 1; $p <= $npages; $p++) { if ($p == $page) $pages .= '' . ($p) . ''; else $pages .= '' . ($p) . ''; - if ($p < $npages) + if ($p < $npages) $pages .= ' - '; } } @@ -251,30 +250,29 @@ $string2.= ''; if ($page != 0 && $nbanswers) { ?> - $("#PREV_PAGE").bind('click',function(){gotopage()}); + $("#PREV_PAGE").bind('click',function(){gotopage()}); - $("#PREV_PAGE").unbind('click'); + $("#PREV_PAGE").unbind('click'); - $("#NEXT_PAGE").bind('click',function(){gotopage()}); + $("#NEXT_PAGE").bind('click',function(){gotopage()}); - $("#NEXT_PAGE").unbind('click'); + $("#NEXT_PAGE").unbind('click'); -}); + }); get_datas()) > 0) $docType = $record->get_type(); $title = $record->get_title(); - $light_info = $twig->render('common/technical_datas.twig', array('record' => $record)); - $caption = $twig->render('common/caption.html', array('view' => 'answer', 'record' => $record)); + + try + { + $record->get_subdef('document'); + $light_info = $twig->render('common/technical_datas.twig', array('record' => $record)); + } + catch (\Exception $e) + { + $light_info = ''; + } + $caption = $twig->render('common/caption.html', array('view' => 'answer', 'record' => $record)); if ($i == 0) @@ -345,8 +352,6 @@ if (count($result->get_datas()) > 0) } ?>
'; $status .= $record->get_status_icons(); @@ -354,21 +359,20 @@ if (count($result->get_datas()) > 0) echo $status; - $isVideo = ($docType == 'video'); - $isAudio = ($docType == 'audio'); - $isImage = ($docType == 'image'); + $isVideo = ($docType == 'video'); + $isAudio = ($docType == 'audio'); + $isImage = ($docType == 'image'); $isDocument = ($docType == 'document'); $sd = $record->get_subdefs(); - $isImage = false; + $isImage = false; $isDocument = false; if (!$isVideo && !$isAudio) { $isImage = true; } - ?>
get_datas()) > 0) $pic_roll = str_replace(array('&', '"'), array('&', '"'), $pic_roll); ?> + { + ?>height:128px;" onclick="" class=" captionTips" id="IMGget_base_id() ?>_get_record_id() ?>" src="get_url() ?>" tooltipsrc="" />
' . collection::getLogo($record->get_base_id()); - $minilogos .= '
'; - $sbas_id = $record->get_sbas_id(); - echo $minilogos; + $minilogos .= '
' . collection::getLogo($record->get_base_id()); + $minilogos .= '
'; + $sbas_id = $record->get_sbas_id(); + echo $minilogos; - if ( - $ACL->has_right_on_base($record->get_base_id(), 'candwnldpreview') || - $ACL->has_right_on_base($record->get_base_id(), 'candwnldhd') || - $ACL->has_right_on_base($record->get_base_id(), 'cancmd') - ) - { + if ( + $ACL->has_right_on_base($record->get_base_id(), 'candwnldpreview') || + $ACL->has_right_on_base($record->get_base_id(), 'candwnldhd') || + $ACL->has_right_on_base($record->get_base_id(), 'cancmd') + ) + { ?>
'; - $b = true; + $b = true; foreach ($proposals["BASES"] as $zbase) { if ((int) (count($proposals["BASES"]) > 1) && count($zbase["TERMS"]) > 0) { $style = $b ? 'style="margin-top:0px;"' : ''; - $b = false; + $b = false; $html .= "

" . sprintf(_('reponses::propositions pour la base %s'), htmlentities($zbase["NAME"])) . "

"; } - $t = true; + $t = true; foreach ($zbase["TERMS"] as $path => $props) { $style = $t ? 'style="margin-top:0px;"' : ''; - $t = false; + $t = false; $html .= "

" . sprintf(_('reponses::propositions pour le terme %s'), htmlentities($props["TERM"])) . "

"; $html .= $props["HTML"]; } diff --git a/www/client/index.php b/www/client/index.php index 5dafe03272..f93357da20 100644 --- a/www/client/index.php +++ b/www/client/index.php @@ -102,6 +102,14 @@ $user = User_Adapter::getInstance($usr_id, $appbox); +
@@ -231,17 +239,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox); } foreach ($user->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll) { - if ($showbases) - { - $options .= ''; - $allbcol = array(); - $n_allbcol = 0; - if (count($databox->get_collections()) > 0) - { - $options .= ''; - } - foreach ($databox->get_collections() as $coll) - { $allbcol[] = $coll->get_base_id(); $n_allbcol++; @@ -262,8 +259,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox); } } echo ''; - } - } ?>
get('GV_view_bas_and_coll')) { - if ($registry->get('GV_view_bas_and_coll')) - { ?>
@@ -434,28 +427,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox); '' . '
'; } - } - } - if ($sxe->description) - { - foreach ($sxe->description->children() as $f => $field) - { - if ($field['type'] == 'date' && $field['searchclient'] == '1') - { - $dateFilters .= '
' . - '' . - '' . - '
' . - $f . '
' . _('phraseanet::time:: de') . - '' . - _('phraseanet::time:: a') . - '
' . - '' . - ' ' . - '' . - '
' . - '
'; - } elseif ($field['type'] != 'date') { $fieldsFilters .= ''; @@ -481,7 +452,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
get_collections() as $coll) + foreach ($user->ACL()->get_granted_base(array(), array($databox->get_sbas_id())) as $coll) { $s = "checked"; echo '
'; @@ -497,7 +468,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox); get('GV_thesaurus')) { ?> @@ -576,7 +546,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
-
    +
      • @@ -737,8 +707,10 @@ setBaskStatus(); get('GV_bitly_user')) !== '' && trim($registry->get('GV_bitly_key')) !== '') { + $request = new http_request(); ?> - + +