Changeset 20246a8


Ignore:
Timestamp:
02/24/15 11:03:33 (4 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.2
Children:
f5baa83
Parents:
92bebfa (diff), 4e12d9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
18 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/pc-cupscfg/pc-cupscfg

    r3667cdb r4e12d9a  
    99  rm /usr/local/share/cups/model/HPLIP 
    1010fi 
    11 user=$1 
    1211 
    1312system-config-printer 
  • src-webui/appweb/share/html/include/footer.php

    rd3ef117 r7495ee7  
    1 <? defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php defined('DS') OR die('No direct access allowed.'); ?> 
    22</div> 
    33 
  • src-webui/appweb/share/html/include/functions.php

    r19292c61 r7495ee7  
    1 <? 
     1<?php 
    22defined('DS') OR die('No direct access allowed.'); 
    33 
     
    1414   ?> 
    1515   <script> 
    16         window.history.pushState('AppWeb', 'AppWeb', '<? echo $p; ?>'); 
     16        window.history.pushState('AppWeb', 'AppWeb', '<?php echo $p; ?>'); 
    1717   </script> 
    18    <? 
     18   <?php 
    1919} 
    2020 
     
    241241<center>- <b>Categories</b> -</center><br> 
    242242<div class="onoffswitch"> 
    243     <input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="pbiswitch" onclick="togglePBIMode()" <? if ( $allPBI == "false" ) { echo "checked"; }?>> 
     243    <input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="pbiswitch" onclick="togglePBIMode()" <?php if ( $allPBI == "false" ) { echo "checked"; }?>> 
    244244    <label class="onoffswitch-label" for="pbiswitch"> 
    245245        <span class="onoffswitch-inner"></span> 
     
    247247    </label> 
    248248</div><br> 
    249 <? 
     249<?php 
    250250 
    251251  if ( $allPBI == "true" ) 
  • src-webui/appweb/share/html/include/header.php

    r50f7a1a r7495ee7  
    1 <? defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php defined('DS') OR die('No direct access allowed.'); ?> 
    22<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" 
    33   "http://www.w3.org/TR/html4/frameset.dtd"> 
     
    77<head> 
    88        <meta charset="utf-8" /> 
    9         <title>AppCafe - <? echo "$jail"; ?></title> 
     9        <title>AppCafe - <?php echo "$jail"; ?></title> 
    1010        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 
    1111        <meta name="description" content="AppCafe" /> 
  • src-webui/appweb/share/html/include/leftmenu.php

    rbb5572c5 r7495ee7  
    1 <? defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php defined('DS') OR die('No direct access allowed.'); ?> 
    22<br> 
    3 <? 
     3<?php 
    44  if ( $page == "jails" or $page == "jailinfo" or $page == "jailcreate" ) { 
    55    display_jail_menu(); 
  • src-webui/appweb/share/html/include/login.php

    rbbbdc07 r7495ee7  
    1 <? 
     1<?php 
    22  defined('DS') OR die('No direct access allowed.'); 
    33 
     
    6060</head> 
    6161<body> 
    62 <? 
     62<?php 
    6363  if ( $timeout ) 
    6464    echo "Session timed out, please log in again...<br>"; 
     
    7171  } 
    7272?> 
    73 <p><? echo "$perror"; ?></p> 
    74 <form method="post" action="<? echo "$SELF"; ?>"> 
    75 <table class="jaillist" width="<? if ($deviceType == "computer") { echo "500"; } else { echo "100%"; } ?>"> 
     73<p><?php echo "$perror"; ?></p> 
     74<form method="post" action="<?php echo "$SELF"; ?>"> 
     75<table class="jaillist" width="<?php if ($deviceType == "computer") { echo "500"; } else { echo "100%"; } ?>"> 
    7676<tr> 
    7777  <th></th> 
     
    9595<body> 
    9696</html> 
    97 <? 
     97<?php 
    9898  exit(0);  
    9999?> 
  • src-webui/appweb/share/html/include/nav-computer.php

    r7352997 r7495ee7  
    1 <? defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php defined('DS') OR die('No direct access allowed.'); ?> 
    22<div id="container" style="width:100%;height:100%;" taborder="0"> 
    33 
    4 <? 
     4<?php 
    55   if ( strpos($page, "jail") === false ) 
    66   { 
     
    99<div id="cssmenu" style="height:3.50em;"> 
    1010<ul> 
    11   <li <? if ( $page=="appcafe" ) { echo "class='active'"; } ?>><a href="/?p=appcafe&jail=<? echo "$jailUrl"; ?>"><img src="/images/appcafe.png" height=32 width=32> Home</a></li> 
    12   <li <? if ( $page=="sysapp" ) { echo "class='active'"; } ?>><a href="/?p=sysapp&jail=<? echo "$jailUrl"; ?>"><img src="/images/install.png" height=32 width=32> Installed Apps</a></li> 
    13   <li <? if ( $page=="appcafe-search" ) { echo "class='active'"; } ?>><a href="/?p=appcafe-search&jail=<? echo "$jailUrl"; ?>"><img src="/images/search.png" height=32 width=32> App Search</a></li> 
     11  <li <?php if ( $page=="appcafe" ) { echo "class='active'"; } ?>><a href="/?p=appcafe&jail=<?php echo "$jailUrl"; ?>"><img src="/images/appcafe.png" height=32 width=32> Home</a></li> 
     12  <li <?php if ( $page=="sysapp" ) { echo "class='active'"; } ?>><a href="/?p=sysapp&jail=<?php echo "$jailUrl"; ?>"><img src="/images/install.png" height=32 width=32> Installed Apps</a></li> 
     13  <li <?php if ( $page=="appcafe-search" ) { echo "class='active'"; } ?>><a href="/?p=appcafe-search&jail=<?php echo "$jailUrl"; ?>"><img src="/images/search.png" height=32 width=32> App Search</a></li> 
    1414  <li><a href="/?p=jails" style="align:right;"><img src="/images/warden.png" height=32 width=32> Warden</a></li> 
    15 <? 
     15<?php 
    1616if (USERNAME) 
    1717  echo "  <li><a href=\"/?logout=true\"><img src=\"/images/logout.png\" height=32 width=32> Logout</a></li>"; 
     
    2020</div> 
    2121 
    22 <? 
     22<?php 
    2323} else { 
    2424  // Jail menus 
     
    2626<div id="cssmenu" style="height:3.50em;"> 
    2727<ul> 
    28   <li <? if ( $page=="jails" ) { echo "class='active'"; } ?>><a href="/?p=jails"><img src="/images/jail.png" height=32 width=32> Home</a></li> 
    29   <li <? if ( $page=="jailcreate" ) { echo "class='active'"; } ?>><a href="/?p=jailcreate"><img src="/images/add.png" height=32 width=32> Create Jail</a></li> 
    30   <li <? if ( $page=="appcafe" ) { echo "class='active'"; } ?>><a href="/?p=appcafe&jail=<? echo "$jailUrl"; ?>"><img src="/images/appcafe.png" height=32 width=32> AppCafe</a></li> 
    31 <? 
     28  <li <?php if ( $page=="jails" ) { echo "class='active'"; } ?>><a href="/?p=jails"><img src="/images/jail.png" height=32 width=32> Home</a></li> 
     29  <li <?php if ( $page=="jailcreate" ) { echo "class='active'"; } ?>><a href="/?p=jailcreate"><img src="/images/add.png" height=32 width=32> Create Jail</a></li> 
     30  <li <?php if ( $page=="appcafe" ) { echo "class='active'"; } ?>><a href="/?p=appcafe&jail=<?php echo "$jailUrl"; ?>"><img src="/images/appcafe.png" height=32 width=32> AppCafe</a></li> 
     31<?php 
    3232if (USERNAME) 
    3333  echo "  <li><a href=\"/?logout=true\"><img src=\"/images/logout.png\" height=32 width=32> Logout</a></li>"; 
     
    3636</div> 
    3737 
    38 <? 
     38<?php 
    3939} 
    4040?> 
    4141 
    4242<body> 
    43 <? if ( $page != "dispatcher" ) { ?> 
     43<?php if ( $page != "dispatcher" ) { ?> 
    4444<div id="leftmenu" style="height:100%;width:12.00em;position:absolute;margin-top:10px;marin-left:10px;"> 
    45   <?  
     45  <?php  
    4646     require("include/leftmenu.php"); 
    4747  ?> 
    4848</div> 
    49 <? } ?> 
     49<?php } ?> 
    5050 
    5151<script type="text/javascript"> 
     
    6767}); 
    6868</script> 
    69 <? if ( $page != "dispatcher" ) { ?> 
     69<?php if ( $page != "dispatcher" ) { ?> 
    7070<div id="notifier" style="height:35px;width:600px;position:absolute;margin-top:10px;margin-left:12.50em;"></div> 
    7171 
    7272<div id="body" style="height:100%;width:700px;position:absolute;margin-top:55px;margin-left:12.50em;"> 
    73 <? } else { ?> 
     73<?php } else { ?> 
    7474<div id="body" style="height:100%;width:700px;position:absolute;margin-top:10px;margin-left:0.50em;"> 
    75 <? } ?> 
     75<?php } ?> 
  • src-webui/appweb/share/html/include/nav-phone.php

    r6fe0843 r7495ee7  
    1 <? defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php defined('DS') OR die('No direct access allowed.'); ?> 
    22<div id="container" style="width:100%;height:100%;"> 
    33 
     
    88                <li><a href="/">Home</a></li> 
    99                <li> 
    10                         <a href="/?p=appcafe&jail=<? echo "$jailUrl"; ?>" aria-haspopup="true"><span><img src="/images/appcafe.png" height=24 width=24>AppCafe</span></a> 
     10                        <a href="/?p=appcafe&jail=<?php echo "$jailUrl"; ?>" aria-haspopup="true"><span><img src="/images/appcafe.png" height=24 width=24>AppCafe</span></a> 
    1111                        <ul> 
    12                                 <li><a href="/?p=sysapp&jail=<? echo "$jailUrl"; ?>"><img src="/images/install.png" height=24 width=24> Installed Applications</a></li> 
    13                                 <li><a href="/?p=appcafe-browse&jail=<? echo "$jailUrl"; ?>"><img src="/images/categories.png" height=24 width=24> Browse Categories</a></li> 
    14                                 <li><a href="/?p=appcafe-search&jail=<? echo "$jailUrl"; ?>"><img src="/images/search.png" height=32 width=32> App Search</a></li> 
     12                                <li><a href="/?p=sysapp&jail=<?php echo "$jailUrl"; ?>"><img src="/images/install.png" height=24 width=24> Installed Applications</a></li> 
     13                                <li><a href="/?p=appcafe-browse&jail=<?php echo "$jailUrl"; ?>"><img src="/images/categories.png" height=24 width=24> Browse Categories</a></li> 
     14                                <li><a href="/?p=appcafe-search&jail=<?php echo "$jailUrl"; ?>"><img src="/images/search.png" height=32 width=32> App Search</a></li> 
    1515 
    1616                                <li><a href="/?p=appcafe"><img src="/images/switch.png" height=24 width=24> Change System / Jail</a></li> 
    17                                 <? 
     17                                <?php 
    1818if (USERNAME) 
    1919  echo "                             <li><a href=\"/?logout=true\"><img src=\"/images/logout.png\" height=24 width=24> Logout</a></li>"; 
  • src-webui/appweb/share/html/pages/appcafe-browse.php

    rf27cd24 r7495ee7  
    1 <?  defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php  defined('DS') OR die('No direct access allowed.'); ?> 
    22<h1>AppCafe Categories</h1> 
    33<br> 
    44 
    5 <? 
     5<?php 
    66   display_cats("64"); 
    77?> 
  • src-webui/appweb/share/html/pages/appcafe-search.php

    r254274e r7495ee7  
    1 <? 
     1<?php 
    22 defined('DS') OR die('No direct access allowed.'); 
    33 
     
    1919?> 
    2020 
    21 <h1><? echo $header; ?></h1> 
     21<h1><?php echo $header; ?></h1> 
    2222<br> 
    23 <form method="post" action="?p=appcafe-search&jail=<? echo "$jailUrl"; ?>"> 
    24 Search: <input name="searchtext" type="text" value="<? echo "$searchtext"; ?>" /> <input type="image" style="float: relative;" width="28" height="28" src="images/search.png" alt="Search" /><br> 
    25 Search raw packages: <input name="searchraw" type="checkbox" value="checked" <? if ( $searchraw == "checked") { echo "checked"; } ?> /><br> 
     23<form method="post" action="?p=appcafe-search&jail=<?php echo "$jailUrl"; ?>"> 
     24Search: <input name="searchtext" type="text" value="<?php echo "$searchtext"; ?>" /> <input type="image" style="float: relative;" width="28" height="28" src="images/search.png" alt="Search" /><br> 
     25Search raw packages: <input name="searchraw" type="checkbox" value="checked" <?php if ( $searchraw == "checked") { echo "checked"; } ?> /><br> 
    2626</form> 
    2727 
    28 <? 
     28<?php 
    2929 
    3030  if ( empty($searchtext) ) 
     
    4141   <th></th> 
    4242</tr> 
    43 <? 
     43<?php 
    4444 } else { 
    4545   $totalCols = 2; 
     
    5050   <th></th> 
    5151</tr> 
    52 <? 
     52<?php 
    5353 } 
    5454 
  • src-webui/appweb/share/html/pages/appcafe.php

    r50f7a1a r7495ee7  
    1 <? 
     1<?php 
    22defined('DS') OR die('No direct access allowed.'); 
    33 
     
    1414?> 
    1515 
    16 <h1><? echo $header; ?></h1> 
     16<h1><?php echo $header; ?></h1> 
    1717<br> 
    18 <? 
     18<?php 
    1919 
    2020  if ( $deviceType == "computer" ) {  
     
    2727   <th></th> 
    2828</tr> 
    29 <? 
     29<?php 
    3030   } else { 
    3131     $totalCols = 2; 
     
    3636   <th></th> 
    3737</tr> 
    38 <? 
     38<?php 
    3939   } 
    4040 
  • src-webui/appweb/share/html/pages/appinfo.php

    r478d1dd r7495ee7  
    1 <? 
     1<?php 
    22defined('DS') OR die('No direct access allowed.'); 
    33 
     
    556556    
    557557<br> 
    558 <table class="jaillist" style="width:<? if ( $deviceType == "computer" ) { echo "600px"; } else { echo "100%"; } ?>"> 
     558<table class="jaillist" style="width:<?php if ( $deviceType == "computer" ) { echo "600px"; } else { echo "100%"; } ?>"> 
    559559  <tr> 
    560560    <th colspan=3> 
    561       <?  
     561      <?php  
    562562         echo "$pbiname - $pbiver";  
    563563         if ( "$jail" != "#system" ) 
     
    568568  <tr> 
    569569     <td style="vertical-align: middle; width: 60px;"> 
    570       <? 
     570      <?php 
    571571         $appbusy=false; 
    572572         foreach($dStatus as $curStatus) { 
     
    589589    </td> 
    590590    <td align=left style=""> 
    591       <img align="left" height=64 width=64 src="images/pbiicon.php?i=<? echo "$pbicdir"; ?>/icon.png"> 
    592        <a href="<? echo "$pbiweb"; ?>" target="_new"><? echo "$pbiauth"; ?></a>  
    593        <a href="http://www.freshports.org/<? echo "$pbiorigin"; ?>" target="_new"><img src="/images/external-link.png" height=20 width=20 title="View this package in FreshPorts"></a><br> 
    594        Version: <b><? echo "$pbiver"; ?></b><br> 
    595 <? 
     591      <img align="left" height=64 width=64 src="images/pbiicon.php?i=<?php echo "$pbicdir"; ?>/icon.png"> 
     592       <a href="<?php echo "$pbiweb"; ?>" target="_new"><?php echo "$pbiauth"; ?></a>  
     593       <a href="http://www.freshports.org/<?php echo "$pbiorigin"; ?>" target="_new"><img src="/images/external-link.png" height=20 width=20 title="View this package in FreshPorts"></a><br> 
     594       Version: <b><?php echo "$pbiver"; ?></b><br> 
     595<?php 
    596596  if ( $isPBI ) { 
    597597    if ( ! empty($pbirating) and $pbirating != $SCERROR ) { 
     
    636636  <tr> 
    637637    <td colspan="3"> 
    638        <p><? echo $pbidesc; ?></p> 
     638       <p><?php echo $pbidesc; ?></p> 
    639639    </td> 
    640640  </tr> 
    641641 
    642 <? if ( $isPBI) { ?> 
     642<?php if ( $isPBI) { ?> 
    643643 
    644644  <tr> 
     
    646646<div id="tab-container" class='tab-container'> 
    647647   <ul class='etabs'> 
    648      <?  if ( $hasService and $pbiInstalled ) { ?> 
     648     <?php  if ( $hasService and $pbiInstalled ) { ?> 
    649649     <li class='tab'><a href="#tabs-service">Services</a></li> 
    650      <? } ?> 
    651      <?  if ( $hasConfig and $pbiInstalled ) { ?> 
     650     <?php } ?> 
     651     <?php  if ( $hasConfig and $pbiInstalled ) { ?> 
    652652     <li class='tab'><a href="#tabs-configure">Configuration</a></li> 
    653      <? } ?> 
    654      <?  if ( ! empty($pbiss) ) { ?> 
     653     <?php } ?> 
     654     <?php  if ( ! empty($pbiss) ) { ?> 
    655655     <li class='tab'><a href="#tabs-screenshots">Screenshots</a></li> 
    656      <? } ?> 
    657      <?  if ( ! empty($pbirelated) ) { ?> 
     656     <?php } ?> 
     657     <?php  if ( ! empty($pbirelated) ) { ?> 
    658658     <li class='tab'><a href="#tabs-related">Related</a></li> 
    659      <? } ?> 
    660      <?  if ( ! empty($pbiplugins) ) { ?> 
     659     <?php } ?> 
     660     <?php  if ( ! empty($pbiplugins) ) { ?> 
    661661     <li class='tab'><a href="#tabs-plugins">Plugins</a></li> 
    662      <? } ?> 
    663      <?  if ( ! empty($pbioptions) ) { ?> 
     662     <?php } ?> 
     663     <?php  if ( ! empty($pbioptions) ) { ?> 
    664664     <li class='tab'><a href="#tabs-options">Options</a></li> 
    665      <? } ?> 
    666      <?  if ( ! empty($pbideps) ) { ?> 
     665     <?php } ?> 
     666     <?php  if ( ! empty($pbideps) ) { ?> 
    667667     <li class='tab'><a href="#tabs-deps">Dependencies</a></li> 
    668      <? } ?> 
     668     <?php } ?> 
    669669   </ul> 
    670670   <div class="panel-container"> 
    671      <?  // Do we have screenshots to display? 
     671     <?php  // Do we have screenshots to display? 
    672672         if ( $hasService and $pbiInstalled ) { 
    673673            echo "<div id=\"tabs-service\">\n"; 
     
    724724  </tr> 
    725725 
    726 <? } ?> 
     726<?php } ?> 
    727727 
    728728</table> 
  • src-webui/appweb/share/html/pages/jailcreate.php

    r55e1d30 r7495ee7  
    1 <? 
     1<?php 
    22defined('DS') OR die('No direct access allowed.'); 
    33 
     
    3939<h1>Jail Creation</h1> 
    4040<br> 
    41 <p>The jail, <?echo "$jailname"; ?>, is queued for creation!</p><br> 
     41<p>The jail, <?phpecho "$jailname"; ?>, is queued for creation!</p><br> 
    4242<a href="?p=jails">Back to Jails</a> 
    43 <? 
     43<?php 
    4444  } // End of $badData 
    4545} 
     
    5050<h1>Jail Creation</h1> 
    5151<br> 
    52 <p><? echo "$jailMsg"; ?></p><br> 
     52<p><?php echo "$jailMsg"; ?></p><br> 
    5353<table class="jaillist" style="width:100%"> 
    5454<tr> 
     
    6060<tr> 
    6161  <td>Hostname</td> 
    62   <td><input name="jailname" type="text" title="A valid hostname for this jail" value="<? echo "$jailname"; ?>" /></td> 
     62  <td><input name="jailname" type="text" title="A valid hostname for this jail" value="<?php echo "$jailname"; ?>" /></td> 
    6363</tr> 
    6464<tr> 
    6565  <td>IPv4 Address</td> 
    66   <td><input name="jailipv4" type="text" title="A valid IP address for your network" value="<? echo "$jailipv4"; ?>" /></td> 
     66  <td><input name="jailipv4" type="text" title="A valid IP address for your network" value="<?php echo "$jailipv4"; ?>" /></td> 
    6767</tr> 
    6868<tr> 
     
    7474</table> 
    7575 
    76 <? } ?> 
     76<?php } ?> 
  • src-webui/appweb/share/html/pages/jailinfo.php

    r6804749 r7495ee7  
    1 <? 
     1<?php 
    22defined('DS') OR die('No direct access allowed.'); 
    33 
     
    4343 
    4444?> 
    45 <p><? echo "$jailMsg"; ?></p> 
    46 <button title="Delete <? echo "$jail"; ?>" style="background-color: Transparent;background-repeat:no-repeat;float:right;border: none;background-image: url('/images/remove.png');background-size: 100%; height: 48px; width: 48px;" onclick="delJailConfirm('<? echo "$jail"; ?>')"></button> 
    47 <h1>Jail Configuration for <? echo "$jail"; ?></h1> 
     45<p><?php echo "$jailMsg"; ?></p> 
     46<button title="Delete <?php echo "$jail"; ?>" style="background-color: Transparent;background-repeat:no-repeat;float:right;border: none;background-image: url('/images/remove.png');background-size: 100%; height: 48px; width: 48px;" onclick="delJailConfirm('<?php echo "$jail"; ?>')"></button> 
     47<h1>Jail Configuration for <?php echo "$jail"; ?></h1> 
    4848<table class="jaillist" style="width:100%"> 
    4949<tr> 
     
    5252</tr> 
    5353 
    54 <form method="post" action="?p=jailinfo&jail=<? echo "$jailUrl"; ?>"> 
     54<form method="post" action="?p=jailinfo&jail=<?php echo "$jailUrl"; ?>"> 
    5555<tr> 
    5656  <td>Jail Nickname</td> 
    57   <td><? echo "$jail"; ?></td> 
     57  <td><?php echo "$jail"; ?></td> 
    5858</tr> 
    5959<tr> 
    6060  <td>Jail IPv4 Address</td> 
    61   <td><input name="jailipv4" type="text" value="<? echo "$jailipv4"; ?>" /></td> 
     61  <td><input name="jailipv4" type="text" value="<?php echo "$jailipv4"; ?>" /></td> 
    6262</tr> 
    6363<tr> 
    6464  <td>Network Interface</td> 
    6565  <td><select name="jailnic"> 
    66   <? 
     66  <?php 
    6767     if ( empty($jailnic) ) 
    6868       echo "<option value=\"SYSDEFAULT\" selected>System Default</option>"; 
  • src-webui/appweb/share/html/pages/jails.php

    r72f195f r7495ee7  
    1 <? 
     1<?php 
    22defined('DS') OR die('No direct access allowed.'); 
    33 
     
    7575<p>The Warden will assist you in the creation and management of jails on this machine. To get started, let us first <a href="/?p=jailcreate" style="text-decoration: underline;">create a new jail.</a></p><br> 
    7676<center><img src="/images/warden.png"></center> 
    77 <? 
     77<?php 
    7878   } else { 
    7979     if ($noJails == "YES") { 
     
    9494</tr> 
    9595 
    96 <? 
     96<?php 
    9797   $running=$jailoutput[0]; 
    9898   $stopped=$jailoutput[1]; 
     
    120120</table> 
    121121 
    122 <? } ?> 
     122<?php } ?> 
  • src-webui/appweb/share/html/pages/main.php

    rf27cd24 r7495ee7  
    1 <?  defined('DS') OR die('No direct access allowed.'); ?> 
     1<?php  defined('DS') OR die('No direct access allowed.'); ?> 
    22<h2>Welcome to the AppWeb Utility!</h2> 
    33 
    4 <? 
     4<?php 
    55    
    66?> 
  • src-webui/appweb/share/html/pages/notifier.php

    rafa7d26 r7495ee7  
    1 <? 
     1<?php 
    22  // Get the client IP address 
    33  $CLIENTIP = $_SERVER['REMOTE_ADDR']; 
     
    148148 
    149149?> 
    150 <a href="?p=dispatcher"><? echo "$output"; ?></a> 
     150<a href="?p=dispatcher"><?php echo "$output"; ?></a> 
  • src-qt5/pc-usermanager/maindlgcode.cpp

    rc05ad47 r92bebfa  
    541541  QStringList devlist = pcbsd::Utils::runShellCommand("personacrypt list -r"); 
    542542  for(int i=0; i<devlist.length(); i++){ 
    543     if(devlist[i].isEmpty() || devlist[i].startsWith("gpart:)")){ 
     543    //qDebug() << "Devlist:" << devlist[i]; 
     544    if(devlist[i].isEmpty() || devlist[i].startsWith("gpart:")){ 
    544545      devlist.removeAt(i); 
    545546      i--; 
Note: See TracChangeset for help on using the changeset viewer.