diff --git a/gulliver/bin/tasks/templates/green.html.tpl b/gulliver/bin/tasks/templates/green.html.tpl index bd5eca772..50f0cbb56 100644 --- a/gulliver/bin/tasks/templates/green.html.tpl +++ b/gulliver/bin/tasks/templates/green.html.tpl @@ -51,7 +51,7 @@ -
+
diff --git a/gulliver/js/highlight/core/readme.eng.txt b/gulliver/js/highlight/core/readme.eng.txt index 96590bc96..e47a6043d 100644 --- a/gulliver/js/highlight/core/readme.eng.txt +++ b/gulliver/js/highlight/core/readme.eng.txt @@ -129,7 +129,7 @@ XML: tag any tag from "<" till ">" comment comment - pi processing instruction () + pi processing instruction () cdata CDATA section attribute attribute value attribute's value diff --git a/gulliver/js/highlight/core/readme.rus.txt b/gulliver/js/highlight/core/readme.rus.txt index d458c787f..7e444695f 100644 --- a/gulliver/js/highlight/core/readme.rus.txt +++ b/gulliver/js/highlight/core/readme.rus.txt @@ -133,7 +133,7 @@ XML: tag любой открывающий или закрывающий тег от "<" до ">" comment комментарий - pi инструкции обработки () + pi инструкции обработки () cdata раздел CDATA attribute атрибут value значение атрибута diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index fe670024d..bafa50c3d 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -365,7 +365,7 @@ class G File: $file "; for ($i = $start; $i <= $end; $i++) { - $str = @highlight_string ("", TRUE); + $str = @highlight_string ("", TRUE); $pos1 = strpos ($str,"<?"); $pos2 = strrpos ($str,"?>"); @@ -1651,7 +1651,7 @@ class G } } $f = fopen( $cacheFile , 'w'); - fwrite( $f , " $value ) { diff --git a/gulliver/thirdparty/geshi/contrib/langcheck.php b/gulliver/thirdparty/geshi/contrib/langcheck.php index a4ee4f65f..d0046a533 100644 --- a/gulliver/thirdparty/geshi/contrib/langcheck.php +++ b/gulliver/thirdparty/geshi/contrib/langcheck.php @@ -751,7 +751,7 @@ if ( PHP_SAPI != 'cli' ) { ?> -

Validation process completed in seconds.

+

Validation process completed in seconds.

@@ -759,7 +759,7 @@ if ( PHP_SAPI != 'cli' ) { -Validation process completed in seconds. +Validation process completed in seconds. GeSHi © 2004-2007 Nigel McNie, 2007-2008 Benny Baumann, released under the GNU GPL diff --git a/gulliver/thirdparty/html2ps_pdf/fonts/arial.ttf b/gulliver/thirdparty/html2ps_pdf/fonts/arial.ttf index ff0815cd8..f01bf8cc2 100644 Binary files a/gulliver/thirdparty/html2ps_pdf/fonts/arial.ttf and b/gulliver/thirdparty/html2ps_pdf/fonts/arial.ttf differ diff --git a/gulliver/thirdparty/html2ps_pdf/fonts/cour.ttf b/gulliver/thirdparty/html2ps_pdf/fonts/cour.ttf index 2c99e08c2..9e7feba1d 100644 Binary files a/gulliver/thirdparty/html2ps_pdf/fonts/cour.ttf and b/gulliver/thirdparty/html2ps_pdf/fonts/cour.ttf differ diff --git a/gulliver/thirdparty/html2ps_pdf/fonts/times.ttf b/gulliver/thirdparty/html2ps_pdf/fonts/times.ttf index a998feeca..1cf893ec1 100644 Binary files a/gulliver/thirdparty/html2ps_pdf/fonts/times.ttf and b/gulliver/thirdparty/html2ps_pdf/fonts/times.ttf differ diff --git a/rbac/engine/skins/wf.php b/rbac/engine/skins/wf.php index 4f5f94e7b..15c8780a7 100644 --- a/rbac/engine/skins/wf.php +++ b/rbac/engine/skins/wf.php @@ -1,4 +1,4 @@ - -<? if ( $HTTP_SESSION_VARS['USER_NAME'] != "") print " (" .$HTTP_SESSION_VARS['USER_NAME'] . ")" ?> +<?php if ( $HTTP_SESSION_VARS['USER_NAME'] != "") print " (" .$HTTP_SESSION_VARS['USER_NAME'] . ")" ?> @@ -48,18 +48,18 @@ - +
   
-
+
- - diff --git a/rbac/engine/templates/treePerm.php b/rbac/engine/templates/treePerm.php index 0da598187..b874381de 100644 --- a/rbac/engine/templates/treePerm.php +++ b/rbac/engine/templates/treePerm.php @@ -161,7 +161,7 @@ $dbc = new DBConnection(DB_HOST, DB_RBAC_USER, DB_RBAC_PASS, DB_RBAC_NAME ); -
- +
diff --git a/rbac/engine/templates/treeRole.php b/rbac/engine/templates/treeRole.php index 7337a8469..29ffc0503 100644 --- a/rbac/engine/templates/treeRole.php +++ b/rbac/engine/templates/treeRole.php @@ -163,7 +163,7 @@ - diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 6f98032f4..b903de69a 100644 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -95,7 +95,7 @@ class Translation extends BaseTranslation { $f = fopen( $cacheFile , 'w'); - fwrite( $f , "" ); fclose( $f ); diff --git a/workflow/engine/includes/inc.JSForms.php b/workflow/engine/includes/inc.JSForms.php index 1d173adea..5e617f8a1 100644 --- a/workflow/engine/includes/inc.JSForms.php +++ b/workflow/engine/includes/inc.JSForms.php @@ -1,4 +1,4 @@ - function RefreshDependentFields(ObjectName, Fields, InitValue) { -Values; global $HTTP_GET_VARS; @@ -64,7 +64,7 @@ function RefreshDependentFields(ObjectName, Fields, InitValue) { refillText( Fields[i],'', 'function=text&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + ''+ '&application=' + ''+ '&Dynaform=' + '' ); } - if(FldObj.type == 'select-one') { + if(FldObj.type == 'select-one') { refillDropdown( Fields[i],'', 'function=dropdown&field=' + Fields[i] + '&parent=' + ObjectName + '&value=' + TheObject.value + ''+ '&application=' + ''+ '&Dynaform=' + ''+ '&InitValue=' + InitValue , InitValue); } }else{ @@ -73,7 +73,7 @@ function RefreshDependentFields(ObjectName, Fields, InitValue) { } } } - } @@ -85,7 +85,7 @@ function registerDate ( field, options ) { Obj = getField( divName); value = Obj.value; myDatePicker = new Bs_DatePicker(); -load ( $sDYNAFORM ); $dynTitle = str_replace ( ' ', '_', str_replace ( '/', '_', $aDynaform['DYN_TITLE'] ) ); - $sContent = "AddContent('dynaform', 'xmlform', '" . $sPRO_UID . '/' . $sDYNAFORM . "', '', array(), '" . $dynTitle . 'Post.php' . "');\n"; $sContent .= "G::RenderPage('publish', 'blank');"; file_put_contents ( $pathProcess . $dynTitle . '.php', $sContent ); - //creating the second file, the post file who receive the post form. + //creating the second file, the post file who receive the post form. $pluginTpl = PATH_CORE . 'templates' . PATH_SEP . 'processes' . PATH_SEP . 'webentryPost.tpl'; $template = new TemplatePower ( $pluginTpl ); $template->prepare (); @@ -90,7 +90,7 @@ try { $fileName = $pathProcess . $dynTitle . 'Post.php'; file_put_contents ( $fileName, $template->getOutputContent () ); - //creating the third file, only if this wsClient.php file doesn't exists. + //creating the third file, only if this wsClient.php file doesn't exists. $fileName = $pathProcess . 'wsClient.php'; $pluginTpl = PATH_CORE . 'test' . PATH_SEP . 'unit' . PATH_SEP . 'ws' . PATH_SEP . 'wsClient.php'; @@ -109,9 +109,9 @@ try { file_put_contents ( $fileName, $template->getOutputContent () ); } - //Show link + //Show link $link = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $sPRO_UID . '/' . $dynTitle . '.php'; - //print "\n $link "; + //print "\n $link "; } else { @@ -123,7 +123,7 @@ try { $scriptCode = str_replace ( '/controls/', $http . $_SERVER['HTTP_HOST'] . '/controls/', $scriptCode ); $scriptCode = str_replace ( '/js/maborak/core/images/', $http . $_SERVER['HTTP_HOST'] . '/js/maborak/core/images/', $scriptCode ); - //render the template + //render the template $pluginTpl = PATH_CORE . 'templates' . PATH_SEP . 'processes' . PATH_SEP . 'webentry.tpl'; $template = new TemplatePower ( $pluginTpl ); $template->prepare (); diff --git a/workflow/engine/methods/services/demoSoap.php b/workflow/engine/methods/services/demoSoap.php index 4c961d3be..9f77dd4eb 100644 --- a/workflow/engine/methods/services/demoSoap.php +++ b/workflow/engine/methods/services/demoSoap.php @@ -52,7 +52,7 @@ a.krumo-name { line-height:12px; } -createUser