[phpwsbb-commits] phpwsbb/boost install.php,1.24,1.25

[Shaun M. <sin...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26414

Modified Files:
	install.php 
Log Message:
Halt the install if the image directory is not writable.


Index: install.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** install.php	4 Mar 2005 18:19:41 -0000	1.24
--- install.php	13 Aug 2006 23:46:40 -0000	1.25
***************
*** 38,41 ****
--- 38,52 ----
  }
  
+ /* Create image directory */
+ $phpwsbb_sourcedir = $GLOBALS['core']->source_dir . 'mod/phpwsbb/img/';
+ $phpwsbb_imagedir = $GLOBALS['core']->home_dir . 'images/phpwsbb/';
+ if(PHPWS_File::recursiveFileCopy($phpwsbb_sourcedir, $phpwsbb_imagedir)) {
+     $content .= 'phpwsBB image directory ' . $phpwsbb_imagedir . ' successfully created!<br />';
+ } else {
+     $content .= 'phpwsBB could not create the image directory: ' . $phpwsbb_imagedir . '<br />You will have to do this manually!. Please also make sure it\'s writable before trying again.<br />';
+     $content .= 'phpwsBB has not been installed.<br />';
+     return;
+ }
+ 
  if($status = $GLOBALS['core']->sqlImport(PHPWS_SOURCE_DIR . 'mod/phpwsbb/boost/install.sql', TRUE)) {
  
***************
*** 48,58 ****
  }
  
- /* Create image directory */
- $phpwsbb_sourcedir = $GLOBALS['core']->source_dir . 'mod/phpwsbb/img/';
- $phpwsbb_imagedir = $GLOBALS['core']->home_dir . 'images/phpwsbb/';
- if(PHPWS_File::recursiveFileCopy($phpwsbb_sourcedir, $phpwsbb_imagedir))
-     $content .= 'phpwsBB image directory ' . $phpwsbb_imagedir . ' successfully created!<br />';
- else
-     $content .= 'phpwsBB could not create the image directory: ' . $phpwsbb_imagedir . '<br />You will have to do this manually!<br />';
- 
  ?>
\ No newline at end of file
--- 59,61 ----