Changeset 5393948


Ignore:
Timestamp:
02/04/15 08:04:39 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.2, releng/10.2, stable/10
Children:
a1f399f, 6af4381
Parents:
7e66292 (diff), d3ef117 (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:
8 edited

Legend:

Unmodified
Added
Removed
  • src-webui/appweb/share/html/css/cssmenu.css

    r50f7a1a rd3ef117  
    3030#cssmenu { 
    3131  width: auto; 
    32   border: 3px solid #fd8a17; 
     32  border: 3px solid #C5C5BE; 
    3333  border-radius: 3px; 
    3434  font-family: 'Oswald', sans-serif; 
    3535  line-height: 1; 
    36   background: #f7f7f7; 
    37   background-color: #e15a1f; 
    38   box-shadow: 1px 1px 0 #df7002, 2px 2px 0 #df7002, 3px 3px 3px rgba(0, 0, 0, 0.35); 
     36  background: #2E3131; 
     37  background-color: #B7B7AE; 
     38  box-shadow: 1px 1px 0 #92928B, 2px 2px 0 #92928B, 3px 3px 3px rgba(0, 0, 0, 0.35); 
    3939} 
    4040#cssmenu > ul { 
     
    7979  width: 0; 
    8080  border: 5px solid transparent; 
    81   border-bottom-color: #fd8a17; 
     81  border-bottom-color: #2E3131; 
    8282  -webkit-transition: all 0.25s ease-out; 
    8383  -moz-transition: all 0.25s ease-out; 
     
    114114  text-transform: uppercase; 
    115115  text-decoration: none; 
    116   color: #fd8a17; 
     116  color: #2E3131; 
    117117  background: url('images/bg.png'); 
    118118} 
  • src-webui/appweb/share/html/css/main.css

    r6804749 rd3ef117  
    155155*/ 
    156156table.tecspec th,table.tecspec td{ 
    157         border:1px solid #d4d4d4;padding:5px;padding-top:7px;padding-bottom:7px;vertical-align:top;text-align:left; 
     157        border:1px solid #ACACBF;padding:5px;padding-top:7px;padding-bottom:7px;vertical-align:top;text-align:left; 
    158158} 
    159159 
     
    168168 
    169169table.jaillist th{ 
    170         color:#ffffff;background-color:#555555;border:1px solid #555555;padding:3px;vertical-align:top;text-align:left; 
     170        color:#ffffff;background-color:#ACACBF;border:1px solid #555555;padding:3px;vertical-align:top;text-align:left; 
    171171} 
    172172 
     
    180180 
    181181table.jaillist td{ 
    182         border:1px solid #d4d4d4;padding:5px;padding-top:7px;padding-bottom:7px;vertical-align:top; 
     182        border:1px solid #ACACBF;padding:5px;padding-top:7px;padding-bottom:7px;vertical-align:top; 
    183183} 
    184184 
     
    218218    font-size: 75%; 
    219219    padding-left: 10px; 
    220     background-color: #F2943D; color: #FFFFFF; 
     220    background-color: #B7B7AE; color: #FFFFFF; 
    221221} 
    222222 
  • src-webui/appweb/share/html/include/footer.php

    r8bdbb7d rd3ef117  
    11<? defined('DS') OR die('No direct access allowed.'); ?> 
    2 </div> 
    3  
    4 <div id="meta" class="dark"> 
    5         <ul> 
    6                 <li><a href="http://www.ixsystems.com" id="copyright" title="Created by iXsystems 2014">iXsystems 2014</a></li> 
    7                 <li>Version: .001</li> 
    8                 <li></li> 
    9         </ul> 
    102</div> 
    113 
  • src-webui/appweb/share/html/include/functions.php

    r756345b rd3ef117  
    190190  // Is this app installed? 
    191191  if ( array_search($pbiorigin, $inslist) !== false ) { 
    192    print("    <button title=\"Delete $pbiname\" style=\"background-color: Transparent;background-repeat:no-repeat;border: none;float:right;\" onclick=\"delConfirm('" . $pbiname ."','".rawurlencode($pbiorigin)."','".$pkgCmd."','".$jailUrl."')\"><img src=\"/images/application-exit.png\" height=22 width=22></button>\n"); 
     192    $output=""; 
     193    exec("/usr/local/bin/syscache ".escapeshellarg("pkg $jail local $pbiorigin rdependencies"), $output); 
     194    // Only display the removal option if the app isn't used as a dep on something else 
     195    if ( "$output[0]" == "$SCERROR" ) 
     196      print("    <button title=\"Delete $pbiname\" style=\"background-color: Transparent;background-repeat:no-repeat;border: none;float:right;\" onclick=\"delConfirm('" . $pbiname ."','".rawurlencode($pbiorigin)."','".$pkgCmd."','".$jailUrl."')\"><img src=\"/images/application-exit.png\" height=22 width=22></button>\n"); 
    193197  } else { 
    194198   global $pbiindexdir; 
  • src-webui/appweb/share/html/pages/appcafe-search.php

    r6fe0843 r254274e  
    5555 // Do the search 
    5656 if ( $searchraw == "checked" ) 
    57    $cmd = "pkg search $searchtext $jail 20"; 
     57   $cmd = "pkg search '$searchtext' $jail 20"; 
    5858 else 
    59    $cmd = "pbi search $searchtext all 20"; 
     59   $cmd = "pbi search '$searchtext' all 20"; 
    6060 
    6161 exec("$sc ". escapeshellarg("$cmd"), $pbiarray); 
  • src-webui/appweb/share/html/pages/appinfo.php

    r756345b rd3ef117  
    393393  global $pbiInstalled; 
    394394  global $pkgCmd; 
     395  global $SCERROR; 
    395396 
    396397   if ( $pbiInstalled ) { 
    397      print("    <button title=\"Delete $pbiname from $jail\" style=\"background-color: Transparent;background-repeat:no-repeat;border: none;background-image: url('/images/application-exit.png');background-size: 100%; height: 48px; width: 48px;\" onclick=\"delConfirm('" . $pbiname ."','".rawurlencode($pbiorigin)."','".$pkgCmd."','".$jailUrl."')\" height=48 width=48></button>\n"); 
     398     $output=""; 
     399     exec("/usr/local/bin/syscache ".escapeshellarg("pkg $jail local $pbiorigin rdependencies"), $output); 
     400     // Dont display removal option unless app is not required by others 
     401     if ( "$output[0]" == "$SCERROR" ) 
     402       print("    <button title=\"Delete $pbiname from $jail\" style=\"background-color: Transparent;background-repeat:no-repeat;border: none;background-image: url('/images/application-exit.png');background-size: 100%; height: 48px; width: 48px;\" onclick=\"delConfirm('" . $pbiname ."','".rawurlencode($pbiorigin)."','".$pkgCmd."','".$jailUrl."')\" height=48 width=48></button>\n"); 
    398403   } else { 
    399404     global $pbiindexdir; 
  • src-webui/appweb/share/html/pages/sysapp.php

    rc643743 r254274e  
    6969     // Is this PBIs origin package installed? 
    7070     if ( array_search($pbiorigin, $pkglist) !== false) { 
     71       // Is this PBI just a DEP for another app? If so, skip it 
     72       $output=""; 
     73       exec("/usr/local/bin/syscache ".escapeshellarg("pkg $jail local $pbiorigin rdependencies"), $output); 
     74       if ( "$output[0]" != "$SCERROR" ) 
     75          continue; 
    7176 
    7277       parse_details($pbiorigin, "$jail", $col, true, false); 
  • src-sh/syscache/daemon/syscache-daemon.cpp

    rf47654d r7e66292  
    6161  if(working || curSock==0){ return; } 
    6262  working = true; 
    63   QStringList req, out; 
     63  QStringList req, out, delim; 
     64  delim << " " << "\"" << "\'"; //input string delimiters 
    6465  bool stopdaemon=false; 
    6566  QTextStream stream(curSock); 
    6667  bool done = false; 
    6768  while(!stream.atEnd()){ 
    68     req = QString(stream.readLine()).split(" "); 
     69    req.clear(); 
     70    QString line = stream.readLine(); 
     71    //qDebug() << "Found Request Line:" << line; 
     72    //Be careful about quoted strings (only one input, even if multiple words) 
     73    int index = 0; 
     74    int dindex = 0; //start off with the space (lowest priority) 
     75    while(index < line.length()){ 
     76      //qDebug() << "Pass:" << index << dindex; 
     77      int ni = line.length()-1; 
     78      int ndin = dindex; 
     79      for(int i=dindex; i<delim.length(); i++){ 
     80        int temp = line.indexOf(delim[i],index); 
     81        //qDebug() << " - new index:" << temp << ni << ndin; 
     82        if( temp < ni && temp>0){  
     83          ni = temp; 
     84          ndin = i; 
     85        } 
     86      } 
     87      //NOTE: this delimiter routine will *NOT* work with nested delimiters (this is "some 'nested input'") 
     88      if(ndin==dindex){ dindex = 0; } //found end tag, reset back to lowest priority 
     89      else{ dindex = ndin; } //found the first tag, start with this next time around 
     90      if(ni==line.length()-1){ ni++; } //need to add one on the last entry 
     91      QString tmpreq = line.mid(index, ni-index); 
     92      //qDebug() << "Found Argument:" << tmpreq << index << ni; 
     93      if(!tmpreq.isEmpty()){ 
     94        req << tmpreq; 
     95      } 
     96      index = ni+1; 
     97    } 
    6998    //qDebug() << " - Request:" << req; 
    7099    //qDebug() << "Request Received:" << req; 
Note: See TracChangeset for help on using the changeset viewer.