Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

2013-04-23 13:12:11 -04:00
parent e6b84cfeda c04e19681d
commit b54e9de281
10 changed files with 37 additions and 23 deletions
--- a/gulliver/methods/genericAjax.php
+++ b/gulliver/methods/genericAjax.php
@@ -222,11 +222,11 @@ function sortByChar($aRows, $charSel)
 */
 function queryModified($sqlParsed, $inputSel = "")
 {
-
  if(!empty($sqlParsed['SELECT'])) {
+    $sqlSelectOptions = (isset($sqlParsed["OPTIONS"]) && count($sqlParsed["OPTIONS"]) > 0)? implode(" ", $sqlParsed["OPTIONS"]) : null;

-    $sqlSelect = "SELECT ";
-    $aSelect   = $sqlParsed['SELECT'];
+    $sqlSelect = "SELECT $sqlSelectOptions ";
+    $aSelect   = $sqlParsed["SELECT"];

    $sFieldSel = (count($aSelect)>1 ) ? $aSelect[1]['base_expr'] : $aSelect[0]['base_expr'];
    foreach($aSelect as $key => $value ) {
--- a/gulliver/templates/controller.exception.tpl
+++ b/gulliver/templates/controller.exception.tpl
@@ -3,13 +3,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <title>Server Error :: </title>
-<link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <style>

 .box {
    -moz-border-radius:6px; /* Rounded edges in Firefox */
-  background-image: url(/images/classic/info.gif);
  color :#000;
  border-style:solid;
  border-width:1px;
@@ -54,5 +52,4 @@

 </div>
 </body>
-</html>
-
+</html>
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -551,7 +551,7 @@ class Configurations // extends Configuration
                            $langLocate = 'PTB';
                            break;
                        case 'en':
-                        case 'en_US':
+                        case 'en-US':
                        default:
                            $langLocate = 'EST';
                            break;
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -335,9 +335,12 @@ class PMScript
            for ($i = 0; $i < $iOcurrences; $i ++) {
                // if the variables for that condition has not been previously defined then $variableIsDefined
                // is set to false
-                if (! isset( $this->aFields[$aMatch[2][$i][0]] )) {
-                    // $variableIsDefined = false;
+                if (!isset($this->aFields[$aMatch[2][$i][0]]) && !isset($aMatch[5][$i][0])) {
                    $this->aFields[$aMatch[2][$i][0]] = '';
+                } else {
+                    if (!isset($this->aFields[$aMatch[2][$i][0]])) {
+                        eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
+                    }
                }
                $sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );
                if (! $bEqual) {
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -337,7 +337,9 @@ class Installer extends Controller
        if (substr( $pathShared, - 1 ) != '/') {
            $pathShared .= '/';
        }
-        $logFile = $pathShared . 'log/install.log';
+        $pathSharedLog =  $pathShared . 'log/';
+        G::verifyPath($pathSharedLog, true);
+        $logFile = $pathSharedLog . 'install.log';

        if (! is_file( $logFile )) {
            G::mk_dir( dirname( $pathShared ) );
@@ -839,8 +841,9 @@ class Installer extends Controller
            $updatedConf['default_skin'] = $skinUri;
            $info->uri =  PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login';

+            $indexFileUpdated = true;
            if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
-                $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG);
+                $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], $langUri);
            } else {
                try {
                    G::update_php_ini( $envFile, $updatedConf );
@@ -1335,8 +1338,14 @@ EOL;
        ini_set('max_execution_time', '0');
        ini_set('memory_limit', '256M');

-        $serv = 'http://'.$_SERVER['SERVER_NAME'];
-
+        $serv = 'http://';
+        if (isset($_SERVER['HTTPS']) && trim($_SERVER['HTTPS']) != '') {
+            $serv = 'https://';
+        }
+        $serv .= $_SERVER['SERVER_NAME'];
+        if (isset($_SERVER['SERVER_PORT']) && trim($_SERVER['SERVER_PORT']) != '') {
+            $serv .= ':' . $_SERVER['SERVER_PORT'];
+        }

        // create session
        $cookiefile =  sys_get_temp_dir() . PATH_SEP . 'curl-session';
@@ -1374,7 +1383,6 @@ EOL;

        // File to upload/post
        $postData['form[LANGUAGE_FILENAME]'] = "@".PATH_CORE."content/translations/processmaker.$lang.po";
-
        curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/languages_Import");
        curl_setopt($ch, CURLOPT_HEADER, 0);
        curl_setopt($ch, CURLOPT_VERBOSE, 0);
@@ -1446,7 +1454,6 @@ EOL;
            curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
            curl_setopt($ch, CURLOPT_TIMEOUT, 90);

-
            $output = curl_exec($ch);
            curl_close($ch);
        }
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -263,7 +263,7 @@ class SkinEngine
    $meta    = null;
    $dirBody = null;

-    if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
+    if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
        $ie = intval($arrayMatch[1]);
        $swTrident = (preg_match("/^.*Trident.*$/", $_SERVER["HTTP_USER_AGENT"]))? 1 : 0; //Trident only in IE8+

--- a/workflow/engine/templates/admin/pmLogo.html
+++ b/workflow/engine/templates/admin/pmLogo.html
@@ -72,7 +72,7 @@
    display      : inline;
    margin       : 4px;
    margin-right : 0;
-    padding      : 5px;
+    padding      : 22px;
    border       : 1px solid white;
  }
  #images-view .thumb-wrap span {
@@ -84,7 +84,7 @@
    border     : 1px solid #99bbe8;
    opacity    : 0.5;
    background : #efefef url(/images/ext/row-over.gif) repeat-x left top;
-    padding      : 5px;
+    padding      : 22px;
  }


@@ -92,7 +92,8 @@
    border     : 1px solid #99bbe8;
    background : #eff5fb url(/images/select-icon.png) no-repeat right bottom;
    opacity    : 0.5;
-    padding    : 5px;
+    padding    : 22px;
+    text-align : center;
  }
  #images-view .x-view-selected .thumb {
    background : transparent;
--- a/workflow/engine/templates/admin/pmLogo.js
+++ b/workflow/engine/templates/admin/pmLogo.js
@@ -182,6 +182,7 @@ Ext.onReady(function() {
    autoHeight  : false,
    height      : 800,
    multiSelect : true,
+    autoScroll: true,
    overClass   : 'x-view-over', 
    itemSelector: 'div.thumb-wrap',
    emptyText   : _('ID_NO_IMAGES_TO_DISPLAY'),
--- a/workflow/engine/templates/cases/open.js
+++ b/workflow/engine/templates/cases/open.js
@@ -121,7 +121,7 @@ Ext.onReady(function(){
              var actionMenu = Ext.getCmp('actionMenu');
              actionMenu.menu.removeAll();
              for(j=0; j<data[i].options.length; j++) {
-            	if(!data[i].options[j].hide){
+            	 if(!data[i].options[j].hide){
                  actionMenu.menu.add({
                    text: data[i].options[j].text,
                    handler: data[i].options[j].fn != '' ? Actions[data[i].options[j].fn] : function(){}
@@ -759,6 +759,7 @@ Ext.onReady(function(){
      autoScroll:true,
      modal: true,
      maximizable: false,
+      resizable: false,
      items: [frm]
    });
    win.show();
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -501,8 +501,12 @@ if (defined( 'SYS_TEMP' ) && SYS_TEMP != '') {
        // including workspace shared classes -> particularlly for pmTables
        set_include_path( get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE );
    } else {
-        Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" );
-        Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' );
+        if (SYS_LANG != '' && SYS_SKIN != '') {
+            Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" );
+            Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' );
+        } else {
+            header('location: /errors/error404.php?url=' . urlencode($_SERVER['REQUEST_URI']));
+        }
        die();
    }
 } else { //when we are in global pages, outside any valid workspace