diff --git a/gulliver/methods/errors/error403.php b/gulliver/methods/errors/error403.php old mode 100755 new mode 100644 index ec7453eb5..3e28fff65 --- a/gulliver/methods/errors/error403.php +++ b/gulliver/methods/errors/error403.php @@ -1,35 +1,128 @@ -. - * - * 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.
-
-
- "; - - $fileHeader = PATH_GULLIVER_HOME . 'methods/errors/header.php' ; - include ( $fileHeader); -?> \ No newline at end of file + + + + + + + + +
+ + + +
+ + + + + + + + + +
+ + +
+ + Possible reasons: +
    +
  • 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.
    • +
  • The page you requested is no longer active.
    • +
  • There is a spelling mistake in the link, in case you entered the URL into the browser's address toolbar.
    • +
+
+ + + + + Book iCon + + +
+
+ + + + + + + + + + + + + + + + + +
+ + +
+ + + + + \ No newline at end of file diff --git a/gulliver/methods/errors/error404.php b/gulliver/methods/errors/error404.php old mode 100755 new mode 100644 index e31725e03..6150baeb0 --- a/gulliver/methods/errors/error404.php +++ b/gulliver/methods/errors/error404.php @@ -1,65 +1,128 @@ -. - * - * 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(); -} + + + + + + + + +
-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.
-
- Possible reasons:
- 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.
-
- The page you requested is no longer active.
-
- There is a typographic - error in the link, in case you entered the URL into the browser's address - toolbar.
-
-
- - - -
url $uri
referer$referer
- "; + +
+ -$fileHeader = PATH_GULLIVER_HOME . 'methods/errors/header.php' ; -include ( $fileHeader); + + + + + + +
+ + +
+ + Possible reasons: +
    +
  • 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.
    • +
  • The page you requested is no longer active.
    • +
  • There is a spelling mistake in the link, in case you entered the URL into the browser's address toolbar.
    • +
+
+ + + + + Book iCon + + +
+
+ + + + + + + + + + + + + + + + + +
+ + +
+ + + + + \ No newline at end of file diff --git a/gulliver/methods/errors/images/background.jpg b/gulliver/methods/errors/images/background.jpg new file mode 100644 index 000000000..9e914649f Binary files /dev/null and b/gulliver/methods/errors/images/background.jpg differ diff --git a/gulliver/methods/errors/images/background2.jpg b/gulliver/methods/errors/images/background2.jpg new file mode 100644 index 000000000..5e507b40d Binary files /dev/null and b/gulliver/methods/errors/images/background2.jpg differ diff --git a/gulliver/methods/errors/images/bottom.png b/gulliver/methods/errors/images/bottom.png new file mode 100644 index 000000000..ccbc9214c Binary files /dev/null and b/gulliver/methods/errors/images/bottom.png differ diff --git a/gulliver/methods/errors/images/box_bg.png b/gulliver/methods/errors/images/box_bg.png new file mode 100644 index 000000000..be16d33c6 Binary files /dev/null and b/gulliver/methods/errors/images/box_bg.png differ diff --git a/gulliver/methods/errors/images/colortab.png b/gulliver/methods/errors/images/colortab.png new file mode 100644 index 000000000..127b67e85 Binary files /dev/null and b/gulliver/methods/errors/images/colortab.png differ diff --git a/gulliver/methods/errors/images/colosa.png b/gulliver/methods/errors/images/colosa.png new file mode 100644 index 000000000..141e7a34c Binary files /dev/null and b/gulliver/methods/errors/images/colosa.png differ diff --git a/gulliver/methods/errors/images/content_bg.png b/gulliver/methods/errors/images/content_bg.png new file mode 100644 index 000000000..97744be85 Binary files /dev/null and b/gulliver/methods/errors/images/content_bg.png differ diff --git a/gulliver/methods/errors/images/img-01.png b/gulliver/methods/errors/images/img-01.png new file mode 100644 index 000000000..673df81bf Binary files /dev/null and b/gulliver/methods/errors/images/img-01.png differ diff --git a/gulliver/methods/errors/images/img-02.png b/gulliver/methods/errors/images/img-02.png new file mode 100644 index 000000000..5951ffe3e Binary files /dev/null and b/gulliver/methods/errors/images/img-02.png differ diff --git a/gulliver/methods/errors/images/pm.png b/gulliver/methods/errors/images/pm.png new file mode 100644 index 000000000..9182318e3 Binary files /dev/null and b/gulliver/methods/errors/images/pm.png differ diff --git a/gulliver/methods/errors/images/pmlogo.png b/gulliver/methods/errors/images/pmlogo.png new file mode 100644 index 000000000..7709d1aee Binary files /dev/null and b/gulliver/methods/errors/images/pmlogo.png differ diff --git a/gulliver/methods/errors/images/socialmedia/fb.png b/gulliver/methods/errors/images/socialmedia/fb.png new file mode 100644 index 000000000..d68edfbb9 Binary files /dev/null and b/gulliver/methods/errors/images/socialmedia/fb.png differ diff --git a/gulliver/methods/errors/images/socialmedia/rs.png b/gulliver/methods/errors/images/socialmedia/rs.png new file mode 100644 index 000000000..abb50e2c1 Binary files /dev/null and b/gulliver/methods/errors/images/socialmedia/rs.png differ diff --git a/gulliver/methods/errors/images/socialmedia/tw.png b/gulliver/methods/errors/images/socialmedia/tw.png new file mode 100644 index 000000000..0c0942fd1 Binary files /dev/null and b/gulliver/methods/errors/images/socialmedia/tw.png differ diff --git a/gulliver/methods/errors/images/socialmedia/yb.png b/gulliver/methods/errors/images/socialmedia/yb.png new file mode 100644 index 000000000..b36a57f0d Binary files /dev/null and b/gulliver/methods/errors/images/socialmedia/yb.png differ diff --git a/gulliver/methods/errors/images/top.png b/gulliver/methods/errors/images/top.png new file mode 100644 index 000000000..c936fa7fc Binary files /dev/null and b/gulliver/methods/errors/images/top.png differ diff --git a/gulliver/methods/errors/style1.css b/gulliver/methods/errors/style1.css new file mode 100644 index 000000000..b58dd46da --- /dev/null +++ b/gulliver/methods/errors/style1.css @@ -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; + } \ No newline at end of file diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 8237b19f6..224b23155 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -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) {