Changeset 533

Timestamp:

04/24/08 16:31:41 (7 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #147 - escaping characters for password storage in plog-config.php

+ Fix for ticket #145 - UPDATE instead of INSERT INTO SQL plog-config table if already installed to prohibit duplicate row entries

+ Type editing for install sequence of events - still needs more work for displaying errors during final install of tables and creation of initial collection / album

+ Hopefully the last of apostrophe (') edits and possibly a fix for ticket #111 - need to take another in-depth look at the add, edit, move, delete functions in plog-admin-functions.php and possibly re-write / re-edit them to be more consistent with each other.

Location:

trunk

Files:

• _install.php (modified) (2 diffs)
• lib/plogger/form_setup.php (modified) (3 diffs)
• lib/plogger/form_setup_complete.php (modified) (2 diffs)
• lib/plogger/install_functions.php (modified) (17 diffs)
• plog-functions.php (modified) (1 diff)

trunk/_install.php

@@ -13 +13 @@
 };
 
-// try to proceed to the admin interface. Only succeeds if the configuration is set
+// Create the SQL tables and try to proceed to the admin interface.
+// Only proceeds if the configuration is set.
 if (!empty($_POST['proceed']) && defined('PLOGGER_DB_HOST')) {
         $mysql = check_mysql(PLOGGER_DB_HOST,PLOGGER_DB_USER,PLOGGER_DB_PW,PLOGGER_DB_NAME);
@@ -22 +23 @@
                 connect_db();
                 $col = add_collection(plog_tr("Plogger test collection"),plog_tr("Feel free to delete it"));
-                $alb = add_album(plog_tr("Plogger test album"),plog_tr("feel free to delete it"),$col["id"]);   // undefined index id
+                // only attempt to create an album if the collection was created - sloppy fix for multiple installs
+                if (!empty($col['id'])) {
+                        $alb = add_album(plog_tr("Plogger test album"),plog_tr("feel free to delete it"),$col['id']);
+                }
                 unset($_SESSION["plogger_config"]);
                 unset($_SESSION["install_values"]);

trunk/lib/plogger/form_setup.php

@@ -4 +4 @@
 };
 ?>
-<h1>Plogger Installation</h1>
-<p>To install, simply fill out the following form.  If there are any problems, you will be notified and asked to fix them before the installation will continue.  After the installation has finished, you will be redirected to your Plogger home page.</p>
+<h1>Plogger Configuration Setup</h1>
+<p>To install, simply fill out the following form.  If there are any problems, you will be notified and asked to fix them before the installation will continue.  After the installation has finished, you will be redirected to the Plogger admin page.</p>
 <form action="_install.php" method="post">
 <input type="hidden" name="action" value="install" />
@@ -73 +73 @@
         </tr>
         <tr>
-                <td class="form_label"><label for="ftp_path">FTP Path to Plogger Folder (from FTP login):</label></td>
+                <td class="form_label"><label for="ftp_path">FTP Path to Plogger Base 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>
@@ -79 +79 @@
    <tr>
                 <td class="submitButtonRow" colspan="2">
-                        <input type="submit" name="submit" id="submit" value="Install" />
+                        <input type="submit" name="submit" id="submit" value="Proceed" />
                 </td>
         </tr>

trunk/lib/plogger/form_setup_complete.php

@@ -4 +4 @@
 };
 ?>
+<h1>Plogger Install</h1>
 <form method="POST">
-<p>Setup is now complete</p>
+<p>Configuration setup is now complete.<br/>Click 'Install' to finish installation.</p>
 <p>Your username is <?=$_SESSION['install_values']['admin_username']?> and your password is `<?=$_SESSION['install_values']['admin_password']?>`</p>
 <?php if (!empty($_SESSION["plogger_config"])) { ?>
@@ -11 +12 @@
 <?php } ?>
 <p>
-<input type="submit" name="proceed" value="Proceed"/>
+<input type="submit" name="proceed" value="Install"/>
 </p>
 </form>

trunk/lib/plogger/install_functions.php

@@ -13 +13 @@
                 foreach($errors as $error) {
                         print '<li>' . $error . '</li>';
-                };
+                }
                 print '</ul>';
                 print '<form method="GET" action="_install.php"><input type="submit" value="Try again"/></form>';
                 return false;
-        };
+        }
 
         if (defined('PLOGGER_DB_HOST')) {
@@ -25 +25 @@
                         print '<p>Plogger is already installed!</p>';
                         return false;
-                };
-        };
+                }
+        }
 
         $ok = false;
@@ -34 +34 @@
                 if (empty($form['db_host'])) {
                         $errors[] = 'Please enter the name of your MySQL host.';
-                };
+                }
 
                 if (empty($form['db_user'])) {
                         $errors[] = 'Please enter the MySQL username.';
-                };
+                }
 
                 if (empty($form['db_pass'])) {
-                        $errors[] = 'Please enter the MySQL password.';
-                }
+                        $errors[] = 'Please enter the MySQL password.';
+                }
                 
                 if (empty($form['db_name'])) {
                         $errors[] = 'Please enter the MySQL database name.';
-                };
+                }
                 
                 if (empty($form['gallery_name'])) {
                         $errors[] = 'Please enter the name for your gallery.';
-                };
+                }
                 
                 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 (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.';
-         }
+                                $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']."/";
-            };
-         }
-                };
+                        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']."/";
+                                }
+                        }
+                }
 
                 if (empty($errors)) {
-                        $errors = check_mysql($form['db_host'],$form['db_user'],$form['db_pass'],$form['db_name']);
+                        $mysql_errors = check_mysql($form['db_host'],$form['db_user'],$form['db_pass'],$form['db_name']);
+                        if (ini_get('safe_mode')==1) {
+                                $ftp_errors = check_FTP($form['ftp_host'], $form['ftp_user'], $form['ftp_pass'], $form['ftp_path']);
+                        }else{
+                                $ftp_errors = array();
+                        }
+                        $errors = array_merge($mysql_errors, $ftp_errors);
                         $ok = empty($errors);
-                };
+                }
 
                 if (!$ok) {
@@ -106 +112 @@
                         } else {
                                 $_SESSION["plogger_config"] = $conf;
-                        };
+                        }
                         require(PLOGGER_DIR . 'lib/plogger/form_setup_complete.php');
                         return true;
-                };
-        };
+                }
+        }
 
         // most of the time it's probably running on localhost
         if (empty($form['db_host'])) {
                 $form['db_host'] = 'localhost';
-        };
+        }
    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');
@@ -124 +130 @@
                 if (empty($form[$var])) {
                         $form[$var] = "";
-                };
-        };
+                }
+        }
         require(PLOGGER_DIR . 'lib/plogger/form_setup.php');
 }
@@ -139 +145 @@
         if (1 == version_compare($mysql_version,$mysql_charset_support)) {
                 $default_charset = "DEFAULT CHARACTER SET UTF8";
-        };
+        }
 
         maybe_add_table(
@@ -283 +289 @@
                         VALUES('$key','$long_ago','$size')";
                 mysql_query($sql);
-        };
+        }
 
         $config['default_theme_dir'] = PLOGGER_DIR . 'themes/default/';
@@ -293 +299 @@
         
         $config = array_map('mysql_real_escape_string',$config);
-
-        $query = "INSERT INTO `".TABLE_PREFIX."config`
-                (`theme_dir`,
-                `compression`,
-                `max_thumbnail_size`,
-                `max_display_size`,
-                `thumb_num`,
-                `admin_username`,
-                `admin_email`,
-                `admin_password`,
-                `date_format`,
-                `feed_title`,
-                `gallery_name`,
-                `gallery_url`)
-        VALUES
-                ('${config['default_theme_dir']}',
-                75,
-                100,
-                500,
-                20,
-                '${config['admin_username']}',
-                '${config['admin_email']}',
-                MD5('${config['admin_password']}'),
-                'n.j.Y',
-                'Plogger Photo Feed',
-                '${config['gallery_name']}',
-                '${config['baseurl']}')";
+        
+        $row_exist = mysql_query("SELECT * FROM `".TABLE_PREFIX."config`");
+        $row_exist_num = mysql_num_rows($row_exist);
+
+        if ($row_exist_num == 0) {
+                $query = "INSERT INTO `".TABLE_PREFIX."config`
+                        (`theme_dir`,
+                        `compression`,
+                        `max_thumbnail_size`,
+                        `max_display_size`,
+                        `thumb_num`,
+                        `admin_username`,
+                        `admin_email`,
+                        `admin_password`,
+                        `date_format`,
+                        `feed_title`,
+                        `gallery_name`,
+                        `gallery_url`)
+                VALUES
+                        ('${config['default_theme_dir']}',
+                        75,
+                        100,
+                        500,
+                        20,
+                        '${config['admin_username']}',
+                        '${config['admin_email']}',
+                        MD5('${config['admin_password']}'),
+                        'n.j.Y',
+                        'Plogger Photo Feed',
+                        '${config['gallery_name']}',
+                        '${config['baseurl']}')";
+        } else {
+                $query = "UPDATE `".TABLE_PREFIX."config` SET
+                        `theme_dir` = '${config['default_theme_dir']}',
+                        `compression` = 75,
+                        `max_thumbnail_size` = 100,
+                        `max_display_size` = 500,
+                        `thumb_num` = 20,
+                        `admin_username` = '${config['admin_username']}',
+                        `admin_email` = '${config['admin_email']}',
+                        `admin_password` = MD5('${config['admin_password']}'),
+                        `date_format` = 'n.j.Y',
+                        `feed_title` = 'Plogger Photo Feed',
+                        `gallery_name` = '${config['gallery_name']}',
+                        `gallery_url` = '${config['baseurl']}'";
+        }
 
         mysql_query($query) or die(mysql_error().'<br /><br />'. $query);
 
-        mail($config['admin_email'],"Your new gallery","You have successfully installed your new Plogger gallery. You can manage it at ${config['baseurl']}/admin Username is ${config['admin_username']} and password ${config['admin_password']}.");
+        mail($config['admin_email'],"Your new gallery","You have successfully installed your new Plogger gallery. You can manage it at ${config['baseurl']}admin Username is ${config['admin_username']} and password ${config['admin_password']}.");
 }
 
@@ -332 +357 @@
         $cfg_file .= 'define("PLOGGER_DB_HOST","'.$db_host.'");'."\n";
         $cfg_file .= 'define("PLOGGER_DB_USER","'.$db_user.'");'."\n";
-        $cfg_file .= 'define("PLOGGER_DB_PW","'.$db_pass.'");'."\n";
+        $cfg_file .= 'define("PLOGGER_DB_PW","'.addcslashes($db_pass, '\\$"').'");'."\n";  // escape certain password characters stored in double quotes (\) ($) (")
         $cfg_file .= 'define("PLOGGER_DB_NAME","'.$db_name.'");'."\n";
         $cfg_file .= ''."\n";
         $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";
-   };
+        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","'.addcslashes($ftp_pass, '\\$"').'");'."\n";  // escape certain password characters stored in double quotes (\) ($) (")
+                $cfg_file .= 'define("PLOGGER_FTP_PATH","'.$ftp_path.'");'."\n";
+        }
 
         $cfg_file .= "?>\n";
@@ -358 +383 @@
         while($row = mysql_fetch_array($res,MYSQL_NUM)) {
                 if ($row[0] == $column) $found = true;
-        };
+        }
         if (!$found) {
                 mysql_query("ALTER TABLE $table ADD `$column` ". $add_sql);
@@ -364 +389 @@
         } else {
                 return "<li>$column already present in database.";
-        };
+        }
 }
 
@@ -373 +398 @@
         while($row = mysql_fetch_array($res,MYSQL_NUM)) {
                 if ($row[0] == $column) $found = true;
-        };
+        }
         if ($found) {
                 $sql = "ALTER TABLE $table DROP `$column`";
@@ -380 +405 @@
         } else {
                 //print "$column does not exist<br/>";
-        };
+        }
 }
 
@@ -391 +416 @@
                 if (mysql_error()) {
                         var_dump(mysql_error());
-                };
+                }
         } else {
                 return "<li>Table `$table` already exists, ignoring.";
-        };
+        }
 }
 
@@ -407 +432 @@
         if (gd_missing()) {
                 $errors[] = "PHP GD module was not detected.";
-        };
+        }
 
         if (!function_exists('mysql_connect')) {
                 $errors[] = "PHP MySQL module was not detected.";
-        };
+        }
 
         $files_to_read = array("./","./admin","./css","./images","./lib","./thumbs","./uploads");
@@ -437 +462 @@
                         $errors[] = "Cannot connect to MySQL with the information provided. MySQL error: " 
                                         . mysql_error();
-                };
-        };
+                }
+        }
         $select = @mysql_select_db($database);
         if (!$select) {
                 $errors[] = "Couldn't find the database $database. MySQL error: " . mysql_error();
 
-        };
+        }
+        return $errors;
+}
+
+function check_FTP($host, $user, $pass, $path) {
+        $errors = array();
+
+        $connection = @ftp_connect($host);
+        if (!$connection) {
+                $errors[] = "Couldn't connect to FTP host \"$host\".  Please check your FTP Host:";
+        } else {
+                $login = @ftp_login($connection, $user, $pass);
+                if (!$login) {
+                        $errors[] = "Couldn't login to FTP host \"$host\" with username \"$user\" and password \"$pass\".  Please check your FTP Username: and FTP Password:";
+                } else {
+                        $checkdir = @ftp_chdir($connection, $path."images/"); // check to see if the images/ folder is accessible
+                        if (!$checkdir) {
+                                $errors[] = "Couldn't find the Plogger images\ folder along the path \"$path\".  Please check your FTP Path to Plogger Base Folder (from FTP login):";
+                        }
+                }
+        }
+        @ftp_close($connection);
         return $errors;
 }
@@ -457 +503 @@
         if (file_exists($cf)) {
                 return is_writable($cf);
-        };
+        }
         return is_writable(PLOGGER_DIR);
 }       

trunk/plog-functions.php

@@ -1093 +1093 @@
                         $pic = get_picture_by_id($id);
                         $album = $pic["parent_album"];
-                        $rv = $config["baseurl"].substr(SmartStripSlashes($pic['path']), 0, -4);
+                        $rv = $config["baseurl"].str_replace("%2F", "/", rawurlencode(substr(SmartStripSlashes($pic['path']), 0, -4)));
                 }
         } else {