Merge remote branch 'upstream/master' into BUG-7338

This commit is contained in:
Hector Cortez
2012-10-11 10:53:13 -04:00
20 changed files with 540 additions and 123 deletions

161
gulliver/methods/errors/error403.php Executable file → Normal file
View File

@@ -1,35 +1,128 @@
<?php
/**
* error403.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
$ERROR_TEXT = "403 Forbidden ";
$ERROR_DESCRIPTION = "
You don't have permission to access the requested directory. There is either
no index document or the directory is read-protected.<br />
<br />
<br />
";
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link href="style1.css" type="text/css" rel="stylesheet"/>
</head>
<body style="margin: 0px; overflow: auto; background: url(images/background1.jpg); no-repeat; top;">
<!-- Warp around everything -->
<div id="warp">
$fileHeader = PATH_GULLIVER_HOME . 'methods/errors/header.php' ;
include ( $fileHeader);
?>
<!-- Header top -->
<div id="header_top"></div>
<!-- End header top -->
<!-- Header -->
<div id="header">
<table border="0" cellspacing="0" cellpadding="0" width="90%"><tr>
<td align="left"><img src="images/colosa.png" alt="www.colosa.com" id="colosa" /></td>
<td align="center">
<h2>Access denied!</h2>
<h5>Somebody prohibited this page, or the URL is incorrect.</h5>
</td>
<td align="right"><img src="images/pmlogo.png" alt="www.colosa.com" id="colosa" /></td>
</tr></table>
</div>
<!-- End Header -->
<!-- The content div -->
<div id="content">
<!-- text -->
<div id="text">
<!-- The info text -->
<strong>Possible reasons: </strong>
<ul id="textInfo">
<li>The link is broken. This may occur when you receive a link via email but your client software adds line breaks, thus distorting long URLs.</li>
<li>The page you requested is no longer active.</li>
<li>There is a spelling mistake in the link, in case you entered the URL into the browser's address toolbar.</li>
</ul>
<ul>
<br/>
<h3>Lost? We suggest...</h3>
<!-- End info text -->
<br/>
<!-- Page links -->
<ul id="textInfo">
<li><a href="http://www.processmakerblog.com/" target="_blank">PROCESSMAKER BLOG</a></li>
<li><a href="http://wiki.processmaker.com/index.php/Main_Page" target="_blank">DOCUMENTATION</a></li>
<li><a href="http://forum.processmaker.com/" target="_blank">FORUM</a></li>
<li><a href="http://library.processmaker.com/" target="_blank">LIBRARY</a></li>
<li><a href="http://bugs.processmaker.com/my_view_page.php" target="_blank">BUG TRACKER</a></li>
</ul>
<!-- End page links -->
</div>
<!-- End info text -->
<!-- Book icon -->
<img id="book" src="images/img-02.png" alt="Book iCon" />
<!-- End Book icon -->
<div style="clear:both;"></div>
</div>
<!-- End Content -->
<!-- Footer -->
<div id="footer">
<!-- Twitter -->
<img src="images/pm.png" alt="twitter" id="twitter" />
<p id="twitter_text">
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-licensee" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
&#169; Copyright 2000 - 2012 Colosa, Inc. <a href= "http://www.colosa.com/" target="_blank"> www.colosa.com </a>
</p>
<!-- End Twitter -->
<div id="socialmedia" style="float:left;text-align: right; margin-top: 20px;">
<a href="https://www.facebook.com/processmaker" target="_blank">
<img height="25" width="25" alt="Facebook" src="images/socialmedia/fb.png">
</a>
<a href="http://twitter.com/processmaker" target="_blank">
<img height="25" width="25" alt="Twitter" src="images/socialmedia/tw.png">
</a>
<a href="http://www.youtube.com/processmaker#play/uploads" target="_blank">
<img height="25" width="25" alt="YouTube" src="images/socialmedia/yb.png">
</a>
<a href="http://feeds.feedburner.com/processmaker" target="_blank">
<img height="25" width="25" alt="RSS" src="images/socialmedia/rs.png">
</a>
</div>
<!-- Search Form -->
<!--<form action="#" method="post">
<p id="searchform">
<input type="submit" name="submit" id="submit" value="Search" />
<input type="text" name="search" id="search" />
</p>
</form>-->
<!-- End Search form -->
<div style="clear:both;"></div>
</div>
<!-- End Footer -->
<!-- Footer bottom -->
<div id="footer_bottom"></div>
<!-- End Footer bottom -->
<!-- Social Media list -->
<!-- End Social media -->
<div style="clear:both;"></div>
</div>
<!-- End Warp around everything -->
</div>
</body>
</html>

185
gulliver/methods/errors/error404.php Executable file → Normal file
View File

@@ -1,65 +1,128 @@
<?php
/**
* error404.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
$session = session_id();
if (empty($session)) {
session_start();
}
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link href="style1.css" type="text/css" rel="stylesheet"/>
</head>
<body style="margin: 0px; overflow: auto;">
<!-- Warp around everything -->
<div id="warp">
if ( isset ( $_SESSION['phpFileNotFound'] ) ) {
$uri = $_SESSION['phpFileNotFound'];
} elseif ( isset ( $_GET['l'] ) ){
$uri = htmlentities($_GET['l'], ENT_QUOTES, "UTF-8");
} else {
$uri = 'undefined';
}
$referer = isset ( $_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] :
(isset($_SESSION['phpLastFileFound']) ? $_SESSION['phpLastFileFound'] : '');
$ERROR_TEXT = "404 Not Found ";
$ERROR_DESCRIPTION = "
Your browser (or proxy) sent a request
that this server could not understand.<br />
<br />
<strong>Possible reasons: </strong><br />
Your link is broken. This may occur when you receive
a link via email, but your client software adds line breaks, thus distorting
long URLs. <br />
<br />
The page you requested is no longer active. <br />
<br />
There is a typographic
error in the link, in case you entered the URL into the browser's address
toolbar.<br />
<br />
<br />
<table>
<tr><td><small>url</small></td> <td><small>$uri</small></td></tr>
<tr><td><small>referer</small></td><td><small>$referer</small></td></tr>
</table>
";
<!-- Header top -->
<div id="header_top"></div>
<!-- End header top -->
$fileHeader = PATH_GULLIVER_HOME . 'methods/errors/header.php' ;
include ( $fileHeader);
<!-- Header -->
<div id="header">
<table border="0" cellspacing="0" cellpadding="0" width="90%"><tr>
<td align="left"><img src="images/colosa.png" alt="www.colosa.com" id="colosa" /></td>
<td align="center">
<h2>Oops, page not found!</h2>
<h5>This page may be busy or the URL incorrect.</h5>
</td>
<td align="right"><img src="images/pmlogo.png" alt="www.colosa.com" id="colosa" /></td>
</tr></table>
</div>
<!-- End Header -->
<!-- The content div -->
<div id="content">
<!-- text -->
<div id="text">
<!-- The info text -->
<strong>Possible reasons: </strong>
<ul id="textInfo">
<li>The link is broken. This may occur when you receive a link via email but your client software adds line breaks, thus distorting long URLs.</li>
<li>The page you requested is no longer active.</li>
<li>There is a spelling mistake in the link, in case you entered the URL into the browser's address toolbar.</li>
</ul>
<ul>
<br/>
<h3>Lost? We suggest...</h3>
<!-- End info text -->
<br/>
<!-- Page links -->
<ul id="textInfo">
<li><a href="http://www.processmakerblog.com/" target="_blank">PROCESSMAKER BLOG</a></li>
<li><a href="http://wiki.processmaker.com/index.php/Main_Page" target="_blank">DOCUMENTATION</a></li>
<li><a href="http://forum.processmaker.com/" target="_blank">FORUM</a></li>
<li><a href="http://library.processmaker.com/" target="_blank">LIBRARY</a></li>
<li><a href="http://bugs.processmaker.com/my_view_page.php" target="_blank">BUG TRACKER</a></li>
</ul>
<!-- End page links -->
</div>
<!-- End info text -->
<!-- Book icon -->
<img id="book" src="images/img-01.png" alt="Book iCon" />
<!-- End Book icon -->
<div style="clear:both;"></div>
</div>
<!-- End Content -->
<!-- Footer -->
<div id="footer">
<!-- Twitter -->
<img src="images/pm.png" alt="twitter" id="twitter" />
<p id="twitter_text">
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-licensee" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
&#169; Copyright 2000 - 2012 Colosa, Inc. <a href= "http://www.colosa.com/" target="_blank"> www.colosa.com </a>
</p>
<!-- End Twitter -->
<div id="socialmedia" style="float: left; text-align: right;margin-top: 20px;">
<a href="https://www.facebook.com/processmaker" target="_blank">
<img height="25" width="25" alt="Facebook" src="images/socialmedia/fb.png">
</a>
<a href="http://twitter.com/processmaker" target="_blank">
<img height="25" width="25" alt="Twitter" src="images/socialmedia/tw.png">
</a>
<a href="http://www.youtube.com/processmaker#play/uploads" target="_blank">
<img height="25" width="25" alt="YouTube" src="images/socialmedia/yb.png">
</a>
<a href="http://feeds.feedburner.com/processmaker" target="_blank">
<img height="25" width="25" alt="RSS" src="images/socialmedia/rs.png">
</a>
</div>
<!-- Search Form -->
<!--<form action="#" method="post">
<p id="searchform">
<input type="submit" name="submit" id="submit" value="Search" />
<input type="text" name="search" id="search" />
</p>
</form>-->
<!-- End Search form -->
<div style="clear:both;"></div>
</div>
<!-- End Footer -->
<!-- Footer bottom -->
<div id="footer_bottom"></div>
<!-- End Footer bottom -->
<!-- Social Media list -->
<!-- End Social media -->
<div style="clear:both;"></div>
</div>
<!-- End Warp around everything -->
</div>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1,287 @@
/* Reset */
* {
margin: 0 auto;
padding: 0;
}
/* Body */
body {
background: url(images/background.jpg) no-repeat top #00B4CD;
text-align: center;
}
/* No borders around images */
img {
border: none;
}
/* Warp around everything */
#warp {
margin: 0 auto;
margin-top: 10px;
width: 985px;
font-family: Helvetica;
text-align: left;
}
/* Header */
#header_top {
background: url(images/top.png) no-repeat;
width: 985px;
height: 30px;
}
/* Header content */
#header {
background: url(images/box_bg.png) repeat-y;
width: 985px;
text-align: center;
}
/* Page title */
#header h2 {
padding-top: 10px;
}
/* Subtitle */
#header h5 {
margin-top: 5px;
padding-bottom: 15px;
color: #acacac;
}
/* Content div */
#content {
background: url(images/content_bg.png) repeat-y;
width: 985px;
}
/* The info text */
#text {
float: left;
margin: 10px 0 10px 60px;
width: 420px;
/* IE margin fix */
display: inline;
font-size: 13px;
}
/* The info text P */
#text p {
margin-top: 5px;
font-size: 14px;
line-height: 20px;
color: #292929;
}
/* The links list */
/* The list items */
/* The links */
#text a {
color: #292929;
text-decoration: none;
}
/* Link hover */
#text a:hover {
text-decoration: none;
}
/* The book icon */
#book {
float: right;
width: 472px;
height: 332px;
margin: 20px 20px 10px 0;
}
/* Footer */
#footer {
background: url(images/box_bg.png) repeat-y;
width: 985px;
}
/* Footer bottom */
#footer_bottom {
background: url(images/bottom.png) no-repeat;
width: 985px;
height: 28px;
}
/* Twitter icon */
#twitter {
margin: 10px 0px 0px 60px;
float: left;
}
/* The tweet text */
#twitter_text {
float: left;
margin-left: 10px;
margin-top: 15px;
width: 300px;
color: #878787;
float: left;
font-size: 10px;
}
/* Twitter links */
#twitter_text a {
text-decoration: none;
font-weight: bold;
}
/* Search form */
#searchform {
float: right;
margin: 15px 60px 0px 0px;
/* IE margin fix */
display: inline;
}
/* Search input */
input#search {
background: url(images/searchfield_bg.png) no-repeat;
border: none;
height: 31px;
width: 244px;
float: right;
line-height: 30px;
padding-left: 10px;
}
/* The Send button */
input#submit {
border: none;
float: right;
margin-left: 5px;
height: 31px;
width: 74px;
color: #fff;
}
input:focus {
outline: none;
}
/* Social media */
#socialmedia {
margin-top: 5px;
margin-right: 40px;
margin-bottom: 10px;
display: inline;
list-style: none;
float: right;
}
/* Social media list items */
#socialmedia a{
text-decoration: none;
}
/* COLOR CHANGER */
#colorchanger {
text-align: left;
}
#showChanger {
margin-left: 10px;
}
#colors {
padding: 10px;
background: #425a5e;
height: 17px;
}
/* The div around the color change links */
.colorbox {
width:15px;
height:15px;
border:1px solid #050505;
float:left;
margin:0px 2px;
cursor:pointer;
display:block;
}
/* Blue */
.colorblue {
background-color:#1e82ac;
}
/* Blue Hover */
.colorblue:hover {
background-color:#177197;
}
/* Red */
.colorred {
background-color:#cc2b2b;
}
/* Red Hover */
.colorred:hover {
background-color:#af1a1a;
}
/* Grey */
.colorgrey {
background-color:#4d4d4d;
}
/* Grey Hover */
.colorgrey:hover {
background-color:#7c7c7c;
}
/* Brown */
.colorbrown {
background-color:#4b3a15;
}
/* Brown Hover */
.colorbrown:hover {
background-color:#5e4b20;
}
/* Green */
.colorgreen {
background-color:#6c8b2f;
}
/* Green Hover */
.cologreen:hover {
background-color:#7da137;
}
/* Page title */
#header h2 {
color: #187086;
}
/* Page links */
#text a:hover {
color: #16687d;
}
/* Search button */
input#submit {
background: url(images/searchbutton_bg.png) no-repeat;
}
/* Twitter links */
#twitter_text a {
color: #135869;
}
#textInfo{
list-style: square inside none;
padding: 0px;
margin: 0px;
line-height: 20px;
}
#textInfo li{
padding: 5px 0px;
text-align: justify;
}

View File

@@ -758,34 +758,8 @@ class wsBase
$Fields = array_merge( $oldFields['APP_DATA'], $appFields );
}
$templateContents = file_get_contents( $fileTemplate );
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
//$sContent = G::unhtmlentities($sContent);
$iAux = 0;
$iOcurrences = preg_match_all( '/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/', $templateContents, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
if ($iOcurrences) {
for ($i = 0; $i < $iOcurrences; $i ++) {
preg_match_all( '/@>' . $aMatch[2][$i][0] . '([\w\W]*)' . '@<' . $aMatch[2][$i][0] . '/', $templateContents, $aMatch2, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
$sGridName = $aMatch[2][$i][0];
$sStringToRepeat = $aMatch2[1][0][0];
if (isset( $Fields[$sGridName] )) {
if (is_array( $Fields[$sGridName] )) {
$sAux = '';
foreach ($Fields[$sGridName] as $aRow) {
$sAux .= G::replaceDataField( $sStringToRepeat, $aRow );
}
}
}
$templateContents = str_replace( '@>' . $sGridName . $sStringToRepeat . '@<' . $sGridName, $sAux, $templateContents );
}
}
$sBody = G::replaceDataField( $templateContents, $Fields );
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
if (! $hasEmailFrom || strpos( $sFrom, $aSetup['MESS_ACCOUNT'] ) === false) {