Changeset 555 for trunk/plog-admin/includes/install-functions.php

Timestamp:

07/07/08 17:22:49 (5 months ago)

Author:

kimparsell

Message:

+ Major cleanup of markup in plog-admin section files - markup now structured properly and validates as XHTML Strict
+ Added plog-admin/images/diag-bg.gif - left out of original restructuring
+ plog-admin/plog-options.php - reworked date formats/added 2 new formats
+ plog-admin/includes/install-functions.php - change install email layout
+ plog-admin/js/plogger.js - changed line endings to unix
+ plog-admin/js/ajax_editing.js - minor markup correction
+ plog-includes/js/plog-slideshow.js - corrected markup, changed loop to false
+ plog-includes/plog-functions.php - minor change to comment notification email, minor markup tweaks
+ index.php - markup tweaks in prep for front-end/theme cleanup
+ gallery.php - minor cleanup (remove extra blank line at end of file)
+ plogger.php - minor cleanup (remove extra blank line at end of file)

Files:

• trunk/plog-admin/includes/install-functions.php (modified) (8 diffs)

trunk/plog-admin/includes/install-functions.php

@@ -18 +18 @@
         $errors = check_requirements();
         if (sizeof($errors) > 0) {
-                print '<p>Plogger wont work until the following problems are resolved</p>';
+                print '<p>Plogger will not work until the following problems are resolved</p>';
                 print '<ul>';
                 foreach($errors as $error) {
@@ -24 +24 @@
                 }
                 print '</ul>';
-                print '<form method="GET" action="_install.php"><input type="submit" value="Try again"/></form>';
+                print '<form method="get" action="_install.php"><input type="submit" value="Try again" /></form>';
                 return false;
         }
@@ -101 +101 @@
 
                 if (!$ok) {
-                        print '<ul><li>';
+                        print '<ul>\n<li>';
                         print join("</li>\n<li>",$errors);
-                        print '</li></ul>';
+                        print '</li>\n</ul>';
                 } else {
                         $password = generate_password();
@@ -169 +169 @@
         PRIMARY KEY  (id)"
         ,"Type=MyISAM $default_charset");
-
 
         maybe_add_table(
@@ -373 +372 @@
         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['gallery_url']}plog-admin Username is `${config['admin_username']}` and password `${config['admin_password']}`.");
-}
+                mail($config['admin_email'],"[Plogger] Your new gallery","You have successfully installed your new Plogger gallery.\n\nYou can login and manage it at ${config['gallery_url']}plog-admin.\n\nUsername: ${config['admin_username']}\nPassword: ${config['admin_password']}");
+                }
 
 function create_config_file($db_host,$db_user,$db_pass,$db_name,$ftp_host,$ftp_user,$ftp_pass,$ftp_path) {
@@ -401 +400 @@
 }
 
-
 function maybe_add_column($table,$column,$add_sql) {
         $sql = "DESCRIBE $table";
@@ -429 +427 @@
                 return "<li>dropping $column";
         } else {
-                //print "$column does not exist<br/>";
+                //print "$column does not exist<br />";
         }
 }
@@ -506 +504 @@
                 $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:";
+                        $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."plog-content/images/"); // check to see if the plog-content/images/ folder is accessible
                         if (!$checkdir) {
-                                $errors[] = "Couldn't find the Plogger 'plog-content/images/' folder along the path \"$path\".  Please check your FTP Path to Plogger Base Folder (from FTP login):";
+                                $errors[] = "Couldn't find the Plogger 'plog-content/images/' folder along the path \"$path\". Please check your FTP Path to Plogger Base Folder (from FTP login):";
                         }
                 }