Changeset 517

Timestamp:

03/31/08 23:28:57 (8 months ago)

Author:

sidtheduck

Message:

Workaround for safe_mode enabled hosts. Asks users for FTP login information

Location:

trunk

Files:

• admin/plog-admin-functions.php (modified) (4 diffs)
• lib/plogger/form_setup.php (modified) (2 diffs)
• lib/plogger/install_functions.php (modified) (5 diffs)

trunk/admin/plog-admin-functions.php

@@ -12 +12 @@
                 // Make sure the file exists
                 if($file != "." && $file != ".." && $file[0] != '.') {
-                        // If it's a directiry, list all files within it
+                        // If it's a directory, list all files within it
                         if(is_dir($directory . "/" . $file)) {
                                 $tmp2 = get_files($directory . "/" . $file);
@@ -308 +308 @@
         // a new row into collections table, otherwise the collection will not be usable
         // anyway
-        $create_path = $config["basedir"] . "/images/".$collection_folder;
+        $create_path = $config["basedir"] . "images/".$collection_folder;
 
         // create directory
@@ -513 +513 @@
         // first try to create the directory to hold the images, if that fails, then the album
         // will be unusable anyway
-        $create_path = $config["basedir"] . "/images/".$row["collection_path"]."/".$album_folder;
+        $create_path = $config["basedir"] . "images/".$row["collection_path"]."/".$album_folder;
 
         if (!makeDirs($create_path, 0777)) {
@@ -878 +878 @@
 function makeDirs($strPath, $mode = 0777) //creates directory tree recursively
 {
-   return is_dir($strPath) or ( makeDirs(dirname($strPath), $mode) and mkdir($strPath, $mode) );
+   if (ini_get('safe_mode')==1){
+      return is_dir($strPath) or ( makeDirs(dirname($strPath), $mode) and FTP_makeDirs($strPath) );
+   }else{
+      return is_dir($strPath) or ( makeDirs(dirname($strPath), $mode) and mkdir($strPath, $mode) );
+   }
+}
+
+function FTP_makeDirs($strPath){
+   global $config;
+   
+   $ftpserver = PLOGGER_FTP_HOST;
+   $ftpuser = PLOGGER_FTP_USER;
+   $ftppass = PLOGGER_FTP_PW;
+   
+   $ftppath = str_replace($config["basedir"], '', $strPath);
+   $ftpDir = dirname($ftppath);
+   $ftpnewDir = str_replace($ftpDir."/", '', $ftppath);
+   
+   // create connection
+   $ftpconnection = ftp_connect($ftpserver); 
+   // login to ftp server
+   $ftpresult = ftp_login($ftpconnection, $ftpuser, $ftppass);
+
+   // check if connection was made
+   if ((!$ftpconnection) || (!$ftpresult)) {
+      return false;
+   }else{
+      ftp_chdir($ftpconnection, PLOGGER_FTP_PATH.$ftpDir); // go to destination dir
+      $ftpcreatedir = @ftp_mkdir($ftpconnection, $ftpnewDir); // create directory
+      if ($ftpcreatedir == true){
+         $ftpexecdir = @ftp_site($ftpconnection, 'chmod 0777 '.$ftpnewDir.'/');
+      }else{
+         return false;
+      }
+      if ($ftpexecdir == true){
+         return true;
+      }else{
+         return false;
+      }
+      ftp_close($ftpconnection); // close connection
+   }
 }
 

trunk/lib/plogger/form_setup.php

@@ -13 +13 @@
                 <div id="navcontainer">
                         <h1>Database Setup</h1>
+                </div>
                 </td>
         </tr>
@@ -48 +49 @@
                 <td class="form_input"><input type="text" name="admin_email" id="email" value="<?=$form['admin_email']?>" /></td>
         </tr>
+   <?php
+   //if server is safe_mode enabled, prompt user for FTP info for FTP workaround
+   if (ini_get('safe_mode')==1){?>
+   <tr>
+        <td colspan="2">
+                <div id="navcontainer">
+                        <h1>Safe_mode FTP workaround</h1>
+         <br/>Safe mode has been detected on your server.  FTP access is needed to allow Plogger to work correctly with safe_mode=on.
+      </div>
+                </td>
+        </tr>
         <tr>
+                <td class="form_label"><label for="ftp_host">FTP Host:</label></td>
+                <td class="form_input"><input type="text" name="ftp_host" id="ftp_host" value="<?=$form['ftp_host']?>" /></td>
+        </tr>
+        <tr>
+                <td class="form_label"><label for="ftp_user">FTP Username:</label></td>
+                <td class="form_input"><input type="text" name="ftp_user" id="ftp_user" value="<?=$form['ftp_user']?>" /></td>
+        </tr>
+        <tr>
+                <td class="form_label"><label for="ftp_password">FTP Password:</label></td>
+                <td class="form_input"><input type="password" name="ftp_pass" id="ftp_pass" value="<?=$form['ftp_pass']?>" /></td>
+        </tr>
+        <tr>
+                <td class="form_label"><label for="ftp_name">FTP Path to Plogger Folder (from FTP login):</label></td>
+                <td class="form_input"><input type="text" name="ftp_path" id="ftp_path" value="<?=$form['ftp_path']?>" /></td>
+        </tr>
+   <?php } //end safe_mode workaround ?>
+   <tr>
                 <td class="submitButtonRow" colspan="2">
                         <input type="submit" name="submit" id="submit" value="Install" />

trunk/lib/plogger/install_functions.php

@@ -54 +54 @@
                 if (empty($form['admin_email'])) {
                         $errors[] = 'Please enter your e-mail address.';
+                };
+      
+      if (ini_get('safe_mode')==1) {
+      //if safe_mode enabled, check the FTP information form inputs
+                        if (empty($form['ftp_host'])) {
+                           $errors[] = 'Please enter the name of your FTP host.';
+                   };
+
+                   if (empty($form['ftp_user'])) {
+                           $errors[] = 'Please enter the FTP username.';
+                   };
+
+                   if (empty($form['ftp_pass'])) {
+            $errors[] = 'Please enter the FTP password.';
+         }
+         
+         if (!empty($form['ftp_path'])) {
+            if (substr($form['ftp_path'],0,1)!="/"){
+               $form['ftp_path']="/".$form['ftp_path'];
+            };
+            if (substr($form['ftp_path'],-1)!="/"){
+               $form['ftp_path']=$form['ftp_path']."/";
+            };
+         }
                 };
 
@@ -74 +98 @@
                         );
                                 
-                        $conf = create_config_file($form['db_host'],$form['db_user'],$form['db_pass'],$form['db_name']);
+                        $conf = create_config_file($form['db_host'],$form['db_user'],$form['db_pass'],$form['db_name'],$form['ftp_host'],$form['ftp_user'],$form['ftp_pass'],$form['ftp_path']);
                         // if configuration file is writable, then set the values
                         // otherwise serve the config file to user and ask her to
@@ -92 +116 @@
                 $form['db_host'] = 'localhost';
         };
-
-        $init_vars = array('db_user','db_pass','db_name','gallery_name','admin_email');
+   if (empty($form['ftp_host'])) {
+                $form['ftp_host'] = 'localhost';
+        };
+
+        $init_vars = array('db_user','db_pass','db_name','gallery_name','admin_email','ftp_user','ftp_pass','ftp_path');
         foreach($init_vars as $var) {
                 if (empty($form[$var])) {
@@ -299 +326 @@
 }
 
-function create_config_file($db_host,$db_user,$db_pass,$db_name) {
+function create_config_file($db_host,$db_user,$db_pass,$db_name,$ftp_host,$ftp_user,$ftp_pass,$ftp_path) {
         $cfg_file = "<?php\n";
         $cfg_file .= '// this is the file used to connect to your database.'."\n";
@@ -310 +337 @@
         $cfg_file .= '// define("PLOGGER_EMBEDDED","");        // 1/0 (True/False) if set will overrule automatic check'."\n";
         $cfg_file .= '// define("PLOGGER_LOCALE","");         // da_DK de et fr pl ro_RO tr ...etc.'."\n";
+    if (ini_get('safe_mode')==1) {
+    //if safe_mode enabled, write the FTP workaround information to plog-config.php with db information
+       $cfg_file .= "\n";
+       $cfg_file .= '// these values are used to connect via FTP.'."\n";
+       $cfg_file .= 'define("PLOGGER_FTP_HOST","'.$ftp_host.'");'."\n";
+           $cfg_file .= 'define("PLOGGER_FTP_USER","'.$ftp_user.'");'."\n";
+           $cfg_file .= 'define("PLOGGER_FTP_PW","'.$ftp_pass.'");'."\n";
+           $cfg_file .= 'define("PLOGGER_FTP_PATH","'.$ftp_path.'");'."\n";
+   };
 
         $cfg_file .= "?>\n";