diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-06-14 10:48:39 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-06-14 10:59:34 +0200 |
| commit | b60d6b807c580e58f06a337def9a1a83b1f3bcfc (patch) | |
| tree | 7ee39403eb4f70a9f7120eb8168d6317b339bf1e /admin/WebConsole/barramenu.php | |
| parent | 5367fb5e61f2e89797bfe7df0e4811a1ff890f08 (diff) | |
| parent | e0e4c021382f2c8a66402c545229aa8e528750f9 (diff) | |
#794: Applying new commits from {{{devel}}} branch to {{{pjlink}}} branch.
Diffstat (limited to 'admin/WebConsole/barramenu.php')
| -rw-r--r-- | admin/WebConsole/barramenu.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/admin/WebConsole/barramenu.php b/admin/WebConsole/barramenu.php index 77c8c159..dfb618ed 100644 --- a/admin/WebConsole/barramenu.php +++ b/admin/WebConsole/barramenu.php @@ -13,7 +13,7 @@ if(stripos($device,'iphone') !== false ){$device="iphone";} elseif (stripos($device,'ipad') !== false) {$device="ipad";} elseif (stripos($device,'android') !== false){$device="android";} else{$device=0;} -$version=exec("cat /opt/opengnsys/doc/VERSION.txt"); +$version=@json_decode(file_get_contents("/opt/opengnsys/doc/VERSION.json"))->version; if(preg_match("/1.0.4/",$version) == TRUE ){$version=4;} // ******************************************************************************************************** include_once("./includes/ctrlacc.php"); @@ -178,10 +178,10 @@ if (!$cmd) <TR valign=baseline> <TD width=10><IMG src="./images/iconos/pomo.gif"></TD> <?php if($idtipousuario!=$SUPERADMINISTRADOR){?> - <TD onclick=eleccion(this,1); onmouseout=desresaltar(this); onmouseover=resaltar(this) > + <TD onclick=eleccion(this,1); onmouseout=desresaltar(this); onmouseover=resaltar(this)> <A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/centros.gif"> <SPAN class="menupral"><?php echo $TbMsg[0]?></SPAN></A> </TD> <TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD> - <TD onclick=eleccion(this,2); onmouseout=desresaltar(this); onmouseover=resaltar(this); align=middle> + <TD onclick=eleccion(this,2); onmouseout=desresaltar(this); onmouseover=resaltar(this); align=middle> <A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/acciones.gif"> <SPAN class=menupral ><?php echo $TbMsg[1]?></SPAN></A> </TD> <TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD> <TD onclick=eleccion(this,3); onmouseout=desresaltar(this); onmouseover=resaltar(this); align=middle> @@ -202,11 +202,11 @@ if (!$cmd) <td onclick="eleccion(this,14)" onmouseout="desresaltar(this)" onmouseover="resaltar(this)" align="middle"> <a href="#" style="text-decoration: none"><img border="0" src="./images/iconos/busquedas.gif"> <span class="menupral"><?php echo $TbMsg[14] ?></span></a> </td> <td width="4" align="middle"><img src="./images/iconos/separitem.gif"></td> - + <!--TD onclick=eleccion(this,8) onmouseout=desresaltar(this) onmouseover=resaltar(this) align=middle> <A href="#" style="text-decoration: none"><IMG border=0 src="./images/iconos/reservas.gif"> <SPAN class=menupral ><?php echo $TbMsg[7] ?></SPAN></A> </TD> <TD width=4 align=middle><IMG src="./images/iconos/separitem.gif"></TD--> - + <?php } else{ if($idtipousuario==$SUPERADMINISTRADOR){?> |