Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into security_improvements_using_secured_objects
  • Loading branch information
SvetoKrchnavy committed Dec 10, 2016
2 parents f1ffd12 + 731277b commit 8cd444c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 27 deletions.
2 changes: 1 addition & 1 deletion ajax/zipLookup.php
Expand Up @@ -31,7 +31,7 @@
"<data>\n" .
" <errorcode>0</errorcode>\n" .
" <errormessage></errormessage>\n" .
" <address>" . $street. "</address>\n .
" <address>" . $street. "</address>\n" .
" <city>" . $city . "</city>\n" .
" <state>" . $state . "</state>\n" .
"</data>\n"
Expand Down
5 changes: 3 additions & 2 deletions docker/php/Dockerfile
@@ -1,4 +1,4 @@
FROM php:5.6.28-fpm-alpine
FROM php:5.6.27-fpm-alpine
RUN apk upgrade --update && apk add \
coreutils \
freetype-dev \
Expand All @@ -20,7 +20,8 @@ RUN cd ~ && \
./configure && \
make && \
make install
RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && docker-php-ext-install -j5 mysql gd ldap soap zip
RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j5 mysql gd ldap soap zip
ADD scripts/install-composer.sh /opt/install-composer.sh
RUN dos2unix /opt/install-composer.sh && \
chmod +x /opt/install-composer.sh && \
Expand Down
5 changes: 3 additions & 2 deletions lib/DocumentToText.php
Expand Up @@ -412,7 +412,8 @@ private function readZippedXML($archiveFile, $dataFile)
$zip->close();
// Load XML from a string
// Skip errors and warnings
$xml = DOMDocument::loadXML($data, LIBXML_NOENT | LIBXML_XINCLUDE | LIBXML_NOERROR | LIBXML_NOWARNING);
$xml = new DOMDocument();
$xml->loadXML($data, LIBXML_NOENT | LIBXML_XINCLUDE | LIBXML_NOERROR | LIBXML_NOWARNING);
$raw_text = $xml->saveXML();
// We need to add a space where end-of-line and end-of-paragraphs present
$raw_text_patched = str_replace(
Expand Down Expand Up @@ -581,4 +582,4 @@ private function gettag()
}

}
?>
?>
4 changes: 2 additions & 2 deletions modules/candidates/CreateImageAttachmentModal.tpl
Expand Up @@ -9,8 +9,8 @@
<?php foreach ($this->attachmentsRS as $rowNumber => $attachmentsData): ?>
<?php if ($attachmentsData['isProfileImage'] == '1'): ?>
<div style="text-align:center;">
<a href="attachments/<?php $this->_($attachmentsData['attachmentID']) ?>/<?php $this->_($attachmentsData['storedFilename']) ?>">
<img src="attachments/<?php $this->_($attachmentsData['attachmentID']) ?>/<?php $this->_($attachmentsData['storedFilename']) ?>" border="0" width="165">
<a href="attachments/<?php $this->_($attachmentsData['directoryName']) ?>/<?php $this->_($attachmentsData['storedFilename']) ?>">
<img src="attachments/<?php $this->_($attachmentsData['directoryName']) ?>/<?php $this->_($attachmentsData['storedFilename']) ?>" border="0" width="165">
</a>
</div>
<?php endif; ?>
Expand Down
29 changes: 9 additions & 20 deletions modules/joborders/Edit.tpl
Expand Up @@ -247,26 +247,15 @@
<label id="statusLabel" for="status">Status:</label>
</td>
<td class="tdData">
<?php if(isset($this->overOpenJOQuota) && ($this->data['status'] == 'OnHold' || $this->data['status'] == 'Full' || $this->data['status'] == 'Closed' || $this->data['status'] == 'Canceled')): ?>
<select tabindex="8" id="status" name="status" class="inputbox" style="width: 150px;">
<option <?php if ($this->data['status'] == 'OnHold'): ?>selected<?php endif; ?> value="OnHold">On Hold</option>
<option <?php if ($this->data['status'] == 'Full'): ?>selected<?php endif; ?> value="Full">Full</option>
<option <?php if ($this->data['status'] == 'Closed'): ?>selected<?php endif; ?> value="Closed">Closed</option>
<option <?php if ($this->data['status'] == 'Canceled'): ?>selected<?php endif; ?> value="Canceled">Canceled</option>
</select>&nbsp;*<br />
<span style="font-size:10px;">(You have already reached your limit of <?php echo(FREE_ACCOUNT_JOBORDERS); ?> open Job Orders, and cannot make this Job Order Active.)<br /></font>

<?php else: ?>
<select tabindex="8" id="status" name="status" class="inputbox" style="width: 150px;">
<option <?php if ($this->data['status'] == 'Active'): ?>selected<?php endif; ?> value="Active">Active</option>
<option <?php if ($this->data['status'] == 'Upcoming'): ?>selected<?php endif; ?> value="Upcoming">Upcoming</option>
<option <?php if ($this->data['status'] == 'Lead'): ?>selected<?php endif; ?> value="Lead">Prospective / Lead</option>
<option <?php if ($this->data['status'] == 'OnHold'): ?>selected<?php endif; ?> value="OnHold">On Hold</option>
<option <?php if ($this->data['status'] == 'Full'): ?>selected<?php endif; ?> value="Full">Full</option>
<option <?php if ($this->data['status'] == 'Closed'): ?>selected<?php endif; ?> value="Closed">Closed</option>
<option <?php if ($this->data['status'] == 'Canceled'): ?>selected<?php endif; ?> value="Canceled">Canceled</option>
</select>&nbsp;*
<?php endif; ?>
<select tabindex="8" id="status" name="status" class="inputbox" style="width: 150px;">
<option <?php if ($this->data['status'] == 'Active'): ?>selected<?php endif; ?> value="Active">Active</option>
<option <?php if ($this->data['status'] == 'Upcoming'): ?>selected<?php endif; ?> value="Upcoming">Upcoming</option>
<option <?php if ($this->data['status'] == 'Lead'): ?>selected<?php endif; ?> value="Lead">Prospective / Lead</option>
<option <?php if ($this->data['status'] == 'OnHold'): ?>selected<?php endif; ?> value="OnHold">On Hold</option>
<option <?php if ($this->data['status'] == 'Full'): ?>selected<?php endif; ?> value="Full">Full</option>
<option <?php if ($this->data['status'] == 'Closed'): ?>selected<?php endif; ?> value="Closed">Closed</option>
<option <?php if ($this->data['status'] == 'Canceled'): ?>selected<?php endif; ?> value="Canceled">Canceled</option>
</select>&nbsp;*
</td>

<td class="tdVertical">
Expand Down

0 comments on commit 8cd444c

Please sign in to comment.