Subversion Repositories Applications.papyrus

Rev

Rev 1358 | Rev 1369 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1358 Rev 1360
Line 30... Line 30...
30 
// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY                                |
 30 
// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY                                |
31 
// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT                                  |
 31 
// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT                                  |
32 
// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF                             |
 32 
// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF                             |
33 
// | THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                                    |
 33 
// | THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                                    |
34 
// +------------------------------------------------------------------------------------------------------+
 34 
// +------------------------------------------------------------------------------------------------------+
35 
// CVS : $Id: instal_fichier.inc.php,v 1.32 2007-04-20 12:49:41 ddelon Exp $
 35 
// CVS : $Id: instal_fichier.inc.php,v 1.33 2007-04-20 12:55:07 ddelon Exp $
36 
/**
 36 
/**
37 
* Page de creation des fichiers necessaire a l'installation de Papyrus.
 37 
* Page de creation des fichiers necessaire a l'installation de Papyrus.
38 
*
 38 
*
39 
* Page permettant de creer le fichier de configuration de Papyrus.
 39 
* Page permettant de creer le fichier de configuration de Papyrus.
40 
*
 40 
*
Line 44... Line 44...
44 
//Autres auteurs :
 44 
//Autres auteurs :
45 
*@author        David DELON
 45 
*@author        David DELON
46 
*@author        Patrick PAUL
 46 
*@author        Patrick PAUL
47 
*@author        Jean-Pascal MILCENT <jpm@tela-botanica.org>
 47 
*@author        Jean-Pascal MILCENT <jpm@tela-botanica.org>
48 
*@copyright     Tela-Botanica 2000-2004
 48 
*@copyright     Tela-Botanica 2000-2004
49 
*@version       $Revision: 1.32 $ $Date: 2007-04-20 12:49:41 $
 49 
*@version       $Revision: 1.33 $ $Date: 2007-04-20 12:55:07 $
50 
// +------------------------------------------------------------------------------------------------------+
 50 
// +------------------------------------------------------------------------------------------------------+
51 
**/
 51 
**/
Line 52... Line 52...
52 
 
 52 
 
53 
// +------------------------------------------------------------------------------------------------------+
 53 
// +------------------------------------------------------------------------------------------------------+
Line 226... Line 226...
226 
			'<tt>papyrus</tt> de Papyrus.';
 226 
			'<tt>papyrus</tt> de Papyrus.';
227 
			$txt_ecriture_conf_erreur .= '<div class="code"><code><pre>'.htmlentities($contenu_htaccess).'</pre></code></div>'."\n";
 227 
			$txt_ecriture_conf_erreur .= '<div class="code"><code><pre>'.htmlentities($contenu_htaccess).'</pre></code></div>'."\n";
228 
			$txt_ecriture_conf = '&Eacute;criture sur le serveur du fichier .htaccess... <tt>'.$fichier_config_cible.'</tt>'."\n";
228 
			$txt_ecriture_conf = '&Eacute;criture sur le serveur du fichier .htaccess... <tt>'.$fichier_config_cible.'</tt>'."\n";
229 
			$erreur = testerConfig($sortie_verif, $txt_ecriture_conf, ftp_put($ftp, $fichier_config_cible,$fichier_config_source, FTP_ASCII), $txt_ecriture_conf_erreur, 1, 0);
 229 
			$erreur = testerConfig($sortie_verif, $txt_ecriture_conf, ftp_put($ftp, $fichier_config_cible,$fichier_config_source, FTP_ASCII), $txt_ecriture_conf_erreur, 1, 0);
Line 230... Line -...
230 
 
 - 
 
231
- 
 
232 
=======
 - 
 
233 
			$erreur = testerConfig($sortie_verif, $txt_ecriture_conf,
- 
 
234 
									ftp_put($ftp, $fichier_config_cible,$fichier_config_source, FTP_ASCII),
- 
 
235 
									$txt_ecriture_conf_erreur, 1, 0);
 - 
 
236 
>>>>>>> 1.31
 230 
 
Line 237... Line 231...
237 
		}
 231 
		}
238
232
239 
	   maj_fichier_config_appli($ftp,$fichier,'api/fckeditor/editor/filemanager/browser/default/connectors/php/config.php',array("Caldeira"=>"DDDDD"));
 233 
//	   maj_fichier_config_appli($ftp,$fichier,'api/fckeditor/editor/filemanager/browser/default/connectors/php/config.php',array("Caldeira"=>"DDDDD"));
Line 240... Line -...
240 
	}
 - 
 
241 
}
 234 
	}
Line 242... Line 235...
242 
 
 235 
}
Line 355... Line 348...
355 
 
 348 
 
356 
 
 349 
 
357 
/* +--Fin du code ----------------------------------------------------------------------------------------+
 350 
/* +--Fin du code ----------------------------------------------------------------------------------------+
- 
 
 351 
*
- 
 
 352 
* $Log: not supported by cvs2svn $
- 
 
 353 
* Revision 1.32  2007/04/20 12:49:41  ddelon
358 
*
 354 
* config fckeditor
359 
* $Log: not supported by cvs2svn $
 355 
*
360 
* Revision 1.31  2007/04/20 10:15:15  alexandre_tb
 356 
* Revision 1.31  2007/04/20 10:15:15  alexandre_tb
361 
* correction typo
 357 
* correction typo
362 
*
 358 
*