Gerente "trunk" atualizado

- instalador não verifirá dados de servidor de email (possivelmente fará apenas teste envio de email para o administrador configurado) - exclusão de arquivos desnecessários git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@368 fecfc0c7-e812-0410-ae72-849f08638ee7

Gerente "trunk" atualizado
- instalador não verifirá dados de servidor de email (possivelmente fará apenas teste envio de email para o administrador configurado) - exclusão de arquivos desnecessários git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@368 fecfc0c7-e812-0410-ae72-849f08638ee7
Adriano Vieira
1 parent 8f3a210d
Showing 7 changed files with 6 additions and 120 deletions Show diff stats
include/TIMES.TTF
include/fonts/TIMES.TTF
include/text2png.php
include/text2png_class.php
instalador/templates/install_navbar.tmpl
instalador/templates/install_navbarftpverify.tmpl
instalador/templates/install_navbarmailverify.tmpl
@@ -1,29 +0,0 @@
-<?
-/*
-To draw the PNG - call this script with a URL like the following:
-
-http://www.yoursite.com/text_png.php3?msg=testing+class&rot=15&size=48&font=fonts/ARIAL.TTF
-*/
-require_once('text2png_class.php');
-require_once('library.php');
-$text = new textPNG;
-if (isset($_GET['msg'])) $text->msg = $_GET['msg']; // text to display
-if (isset($_GET['font'])) $text->font = 'fonts/times.ttf'; // font to use (include directory if needed).
-if (isset($_GET['size'])) $text->size = $_GET['size']; // size in points
-if (isset($_GET['rot'])) $text->rot = $_GET['rot']; // rotation
-if (isset($_GET['pad'])) $text->pad = $_GET['pad']; // padding in pixels around text.
-if (isset($red)) $text->red = $red; // text color
-if (isset($grn)) $text->grn = $grn; // ..
-if (isset($blu)) $text->blu = $blu; // ..
-if (isset($bg_red)) $text->bg_red = $bg_red; // background color.
-if (isset($bg_grn)) $text->bg_grn = $bg_grn; // ..
-if (isset($bg_blu)) $text->bg_blu = $bg_blu; // ..
-if (isset($_GET['tr'])) $text->transparent = $_GET['tr']; // transparency flag (boolean).
-LimpaTESTES();
-GravaTESTES('Antes do header');
-header("Content-type: image/png");		
-GravaTESTES('Depois do header');
-GravaTESTES('Antes do DRAW');
-$text->draw();
-GravaTESTES('Depois do DRAW');
-?>
 \ No newline at end of file
@@ -1,88 +0,0 @@
-<?
-require 'library.php';
-class textPNG 
-	{
-	var $font = 'fonts/times.ttf'; //default font. directory relative to script directory.
-	var $msg = "undefineds"; // default text to display.
-	var $size = 10;
-	var $rot = 0; // rotation in degrees.
-	var $pad = 0; // padding.
-	var $transparent = 1; // transparency set to on.
-	var $red = 0; // white text...
-	var $grn = 0;
-	var $blu = 0;
-	var $bg_red = 255; // on black background.
-	var $bg_grn = 255;
-	var $bg_blu = 255;
-
-	function draw() 
-		{
-		$width = 0;
-		$height = 0;
-		$offset_x = 0;
-		$offset_y = 0;
-		$bounds = array();
-		$image = "";
-
-		// determine font height.
-		$bounds = ImageTTFBBox($this->size, $this->rot, $this->font, "W");
-
-		if ($this->rot < 0) 
-			{
-			$font_height = abs($bounds[7]-$bounds[1]);		
-			} 
-		else if ($this->rot > 0) 
-			{
-			$font_height = abs($bounds[1]-$bounds[7]);
-			} 
-		else 
-			{
-			$font_height = abs($bounds[7]-$bounds[1]);
-			}
-
-		// determine bounding box.
-		$bounds = ImageTTFBBox($this->size, $this->rot, $this->font, $this->msg);
-
-		if ($this->rot < 0) 
-			{
-			$width = abs($bounds[4]-$bounds[0]);
-			$height = abs($bounds[3]-$bounds[7]);
-			$offset_y = $font_height;
-			$offset_x = 0;			
-			} 
-		else if ($this->rot > 0) 
-			{
-			$width = abs($bounds[2]-$bounds[6]);
-			$height = abs($bounds[1]-$bounds[5]);
-			$offset_y = abs($bounds[7]-$bounds[5])+$font_height;
-			$offset_x = abs($bounds[0]-$bounds[6]);			
-			} 	
-		else 
-			{
-			$width = abs($bounds[4]-$bounds[6]);
-			$height = abs($bounds[7]-$bounds[1]);
-			$offset_y = $font_height;;
-			$offset_x = 0;
-			}
-
-		$image = ImageCreate($width+($this->pad*2)+1,$height+($this->pad*2)+1);
-
-		$background = ImageColorAllocate($this->$image, $this->bg_red, $this->bg_grn, $this->bg_blu);
-
-		$foreground = ImageColorAllocate($this->$image, $this->red, $this->grn, $this->blu);
-
-		if ($this->transparent) ImageColorTransparent($this->$image, $background);
-
-		ImageInterlace($this->$image, false);
-
-		// render it.
-		ImageTTFText($this->$image, $this->size, $this->rot, $offset_x+$this->pad, $offset_y+$this->pad, $foreground, $this->font, $this->msg);
-
-		// output PNG object.
-		ImagePNG($this->$image);
-
-		ImageDestroy($this->$image);
-
-		}
-	}
-?>	
 \ No newline at end of file
@@ -244,7 +244,7 @@
 		     <td colspan=2>
 				<div class="navbar-btn">
 						<div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>
-						<div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'MailVerify' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div>
+						<div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'FtpVerify' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div>
 				</div>
 		     </td>
 		  </tr>
@@ -19,7 +19,7 @@
 		  <tr class="navbar">
 		     <td colspan=2>
 				<div class="navbar-btn">
-						<div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'MailVerify' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>
+						<div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'Configuration' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>
 						<div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'adminSetup' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div>
 				</div>
 		     </td>
@@ -46,6 +46,9 @@
 		</fieldset>
 		<fieldset>
 		  <legend>{KCIQ_CONFIGURATIONS}</legend>
+		  aqui a
+		  ajuda
+		  para ftp
 		<fieldset class="configinstall">
 		  <legend>{KCIQ_INST_FTPVERIFY}</legend>
 		   <table>
@@ -35,7 +35,7 @@
 						  </script>
 				      <div class="botoes">
 				        <div class="btnleft"><div class="btnright">
-				            <a onClick="setDocVar( 'task', 'testConnMail' ); asvAjaxGetFormData('installForm', 'msgStatus'); return false;" title="{KCIQ_TESTCONN_HELP}">
+				            <a onClick="setDocVar( 'task', 'testConnEMail' ); asvAjaxGetFormData('installForm', 'msgStatus'); return false;" title="{KCIQ_TESTCONN_HELP}">
 				               {KCIQ_TESTCONN}</a>
 				        </div></div>
 				       </div>
...	...	@@ -1,29 +0,0 @@
1		-<?
2		-/*
3		-To draw the PNG - call this script with a URL like the following:
4		-
5		-http://www.yoursite.com/text_png.php3?msg=testing+class&rot=15&size=48&font=fonts/ARIAL.TTF
6		-*/
7		-require_once('text2png_class.php');
8		-require_once('library.php');
9		-$text = new textPNG;
10		-if (isset($_GET['msg'])) $text->msg = $_GET['msg']; // text to display
11		-if (isset($_GET['font'])) $text->font = 'fonts/times.ttf'; // font to use (include directory if needed).
12		-if (isset($_GET['size'])) $text->size = $_GET['size']; // size in points
13		-if (isset($_GET['rot'])) $text->rot = $_GET['rot']; // rotation
14		-if (isset($_GET['pad'])) $text->pad = $_GET['pad']; // padding in pixels around text.
15		-if (isset($red)) $text->red = $red; // text color
16		-if (isset($grn)) $text->grn = $grn; // ..
17		-if (isset($blu)) $text->blu = $blu; // ..
18		-if (isset($bg_red)) $text->bg_red = $bg_red; // background color.
19		-if (isset($bg_grn)) $text->bg_grn = $bg_grn; // ..
20		-if (isset($bg_blu)) $text->bg_blu = $bg_blu; // ..
21		-if (isset($_GET['tr'])) $text->transparent = $_GET['tr']; // transparency flag (boolean).
22		-LimpaTESTES();
23		-GravaTESTES('Antes do header');
24		-header("Content-type: image/png");
25		-GravaTESTES('Depois do header');
26		-GravaTESTES('Antes do DRAW');
27		-$text->draw();
28		-GravaTESTES('Depois do DRAW');
29		-?>
30	0	\ No newline at end of file
...	...	@@ -1,88 +0,0 @@
1		-<?
2		-require 'library.php';
3		-class textPNG
4		- {
5		- var $font = 'fonts/times.ttf'; //default font. directory relative to script directory.
6		- var $msg = "undefineds"; // default text to display.
7		- var $size = 10;
8		- var $rot = 0; // rotation in degrees.
9		- var $pad = 0; // padding.
10		- var $transparent = 1; // transparency set to on.
11		- var $red = 0; // white text...
12		- var $grn = 0;
13		- var $blu = 0;
14		- var $bg_red = 255; // on black background.
15		- var $bg_grn = 255;
16		- var $bg_blu = 255;
17		-
18		- function draw()
19		- {
20		- $width = 0;
21		- $height = 0;
22		- $offset_x = 0;
23		- $offset_y = 0;
24		- $bounds = array();
25		- $image = "";
26		-
27		- // determine font height.
28		- $bounds = ImageTTFBBox($this->size, $this->rot, $this->font, "W");
29		-
30		- if ($this->rot < 0)
31		- {
32		- $font_height = abs($bounds[7]-$bounds[1]);
33		- }
34		- else if ($this->rot > 0)
35		- {
36		- $font_height = abs($bounds[1]-$bounds[7]);
37		- }
38		- else
39		- {
40		- $font_height = abs($bounds[7]-$bounds[1]);
41		- }
42		-
43		- // determine bounding box.
44		- $bounds = ImageTTFBBox($this->size, $this->rot, $this->font, $this->msg);
45		-
46		- if ($this->rot < 0)
47		- {
48		- $width = abs($bounds[4]-$bounds[0]);
49		- $height = abs($bounds[3]-$bounds[7]);
50		- $offset_y = $font_height;
51		- $offset_x = 0;
52		- }
53		- else if ($this->rot > 0)
54		- {
55		- $width = abs($bounds[2]-$bounds[6]);
56		- $height = abs($bounds[1]-$bounds[5]);
57		- $offset_y = abs($bounds[7]-$bounds[5])+$font_height;
58		- $offset_x = abs($bounds[0]-$bounds[6]);
59		- }
60		- else
61		- {
62		- $width = abs($bounds[4]-$bounds[6]);
63		- $height = abs($bounds[7]-$bounds[1]);
64		- $offset_y = $font_height;;
65		- $offset_x = 0;
66		- }
67		-
68		- $image = ImageCreate($width+($this->pad2)+1,$height+($this->pad2)+1);
69		-
70		- $background = ImageColorAllocate($this->$image, $this->bg_red, $this->bg_grn, $this->bg_blu);
71		-
72		- $foreground = ImageColorAllocate($this->$image, $this->red, $this->grn, $this->blu);
73		-
74		- if ($this->transparent) ImageColorTransparent($this->$image, $background);
75		-
76		- ImageInterlace($this->$image, false);
77		-
78		- // render it.
79		- ImageTTFText($this->$image, $this->size, $this->rot, $offset_x+$this->pad, $offset_y+$this->pad, $foreground, $this->font, $this->msg);
80		-
81		- // output PNG object.
82		- ImagePNG($this->$image);
83		-
84		- ImageDestroy($this->$image);
85		-
86		- }
87		- }
88		-?>
89	0	\ No newline at end of file
...	...	@@ -244,7 +244,7 @@
244	244	<td colspan=2>
245	245	<div class="navbar-btn">
246	246	<div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>
247		- <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'MailVerify' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div>
	247	+ <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'FtpVerify' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div>
248	248	</div>
249	249	</td>
250	250	</tr>
...	...
...	...	@@ -19,7 +19,7 @@
19	19	<tr class="navbar">
20	20	<td colspan=2>
21	21	<div class="navbar-btn">
22		- <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'MailVerify' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>
	22	+ <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'Configuration' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>
23	23	<div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'adminSetup' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div>
24	24	</div>
25	25	</td>
...	...	@@ -46,6 +46,9 @@
46	46	</fieldset>
47	47	<fieldset>
48	48	<legend>{KCIQ_CONFIGURATIONS}</legend>
	49	+ aqui a
	50	+ ajuda
	51	+ para ftp
49	52	<fieldset class="configinstall">
50	53	<legend>{KCIQ_INST_FTPVERIFY}</legend>
51	54	<table>
...	...
...	...	@@ -35,7 +35,7 @@
35	35	</script>
36	36	<div class="botoes">
37	37	<div class="btnleft"><div class="btnright">
38		- <a onClick="setDocVar( 'task', 'testConnMail' ); asvAjaxGetFormData('installForm', 'msgStatus'); return false;" title="{KCIQ_TESTCONN_HELP}">
	38	+ <a onClick="setDocVar( 'task', 'testConnEMail' ); asvAjaxGetFormData('installForm', 'msgStatus'); return false;" title="{KCIQ_TESTCONN_HELP}">
39	39	{KCIQ_TESTCONN}</a>
40	40	</div></div>
41	41	</div>
...	...