From: <cra...@us...> - 2007-06-01 13:58:21
|
Revision: 171 http://svn.sourceforge.net/easybox-mod/?rev=171&view=rev Author: craftsnux Date: 2007-06-01 06:58:20 -0700 (Fri, 01 Jun 2007) Log Message: ----------- compatibilite du skin mediacenter avec la fbx 4 a verifier pour la HD Modified Paths: -------------- trunk/_framework/fonctions_partagees.inc.php trunk/_framework/framework.php trunk/skin/mediacenter/menu.tpl Modified: trunk/_framework/fonctions_partagees.inc.php =================================================================== --- trunk/_framework/fonctions_partagees.inc.php 2007-06-01 11:19:14 UTC (rev 170) +++ trunk/_framework/fonctions_partagees.inc.php 2007-06-01 13:58:20 UTC (rev 171) @@ -1,5 +1,45 @@ <?php +function fbx_GetBoxUserAgent() +{ + // Analyse le user_agent de la box + // Le firmware peut \xEAtre dans le format : + // freebox/1.0.0 (hw:5.0; sw:1.2.1) ifc:12345678901 + // ou le format : + // freebox/1.7.3-ppp + if (isset($HTTP_SERVER_VARS['HTTP_X_BOX_USER_AGENT']) $userboxagent = + $HTTP_SERVER_VARS['HTTP_X_BOX_USER_AGENT']; + + if (isset($HTTP_SERVER_VARS['HTTP_BOX_USER_AGENT']) $userboxagent = + $HTTP_SERVER_VARS['HTTP_BOX_USER_AGENT']; + + if (isset($userboxagent)) + { + // Nouveau format de useragent + if (preg_match('/(.*)\/(.*) \(hw:(.*); sw:(.*)\) ifc:(.*)/', $box_user_agent, $regs)) + { + $boxinfo['name'] = $regs[1]; + $boxinfo['version'] = $regs[2]; + $boxinfo['firmware'] = $regs[3]; + $boxinfo['browser_version'] = $regs[4]; + $boxinfo['ifc'] = $regs[5]; + } + else + { + preg_match('/(.*)\/(.*)/', $box_user_agent, $regs); + + $boxinfo['name'] = $regs[1]; + $boxinfo['version'] = "x.x"; + $boxinfo['firmware'] = $regs[2]; + $boxinfo['browser_version'] = "#"; + $boxinfo['ifc'] = "#"; + } + + $boxinfo['shortdesc'] = $boxinfo['name'].'_'.$boxinfo['version'].' ('.$boxinfo['firmware'].')'; + } + + return $boxinfo; +} //Fonction permettant de lire un fichier function play_fichier($page,$basename, $realpath=1, $type='video', $name='', $duree=0){ global $ini,$USER; Modified: trunk/_framework/framework.php =================================================================== --- trunk/_framework/framework.php 2007-06-01 11:19:14 UTC (rev 170) +++ trunk/_framework/framework.php 2007-06-01 13:58:20 UTC (rev 171) @@ -7,13 +7,6 @@ setlocale(LC_TIME, "fr"); - $vers_fbx = $_SERVER["HTTP_USER_AGENT"]; - $ereg = 'freebox\/[0-9]\.[0-9]\.[0-9] \(hw:([0-9]).0;'; - if(preg_match("/$ereg/s", $vers_fbx, $val_vers)){ - $vers_fbx = $val_vers[1]; - }else{ - $vers_fbx = 4; - } unset($val_vers); @@ -60,7 +53,10 @@ $smarty->assign('IMG2FBX',$IMG2FBX); $LOAD = $FRAMEWORK_REP.'fonctions_partagees.inc.php'; require_once($LOAD); - +// version de freebox + $info_fbx=fbx_GetBoxUserAgent(); + $vers_fbx =$info_fbx['version']; + $EXPLORATEUR = $MODULE.'_explorateur/index1.php'; $smarty->assign('EXPLORATEUR',$EXPLORATEUR); $PLAYLIST = $USER.'playlist/'; Modified: trunk/skin/mediacenter/menu.tpl =================================================================== --- trunk/skin/mediacenter/menu.tpl 2007-06-01 11:19:14 UTC (rev 170) +++ trunk/skin/mediacenter/menu.tpl 2007-06-01 13:58:20 UTC (rev 171) @@ -8,19 +8,19 @@ {section name=menu loop=$MENU} {if $CAT=="1" AND NOT $SHOW} {if $smarty.section.menu.first} - <a focused onfocus='front_panel="FILMS";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> + <a focused onfocus='front_panel="FILMS";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=0&iw=360&ih=192";' href="../../module/films/index1.php"> </a> - <a onfocus='front_panel="MODULES";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> + <a onfocus='front_panel="MODULES";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=384&iw=360&ih=192";' href="../../module/_menu/menu.php?show=1"> </a> - <a onfocus='front_panel="PHOTO";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> + <a onfocus='front_panel="PHOTO";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=192&iw=360&ih=192";' href="../../module/diaporama/index1.php"> </a> - <a onfocus='front_panel="AUDIO";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> + <a onfocus='front_panel="AUDIO";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=0&iy=192&iw=360&ih=192";' href="../../module/mp3/lecteuraudio.php"> </a> - <a onfocus='front_panel="BIBLIOTHEQUE";service="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> + <a onfocus='front_panel="BIBLIOTHEQUE";{if $vers_fbx{0}==5}service{else}location{/if}="srv://default?ox=0&oy=0&ow=720&oh=576,&ix=360&iy=0&iw=360&ih=192";' href="../../module/films/catalogue.php"> </a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |