Changeset 546 for trunk/lib/plogger/install_functions.php

Timestamp:

06/05/08 17:18:12 (6 months ago)

Author:

sidtheduck

Message:

+ Lots of sorting fixes

• Now sorting is the same throughout . defaults from Admin->Options are used on both Admin->Manage and front-end gallery . plogger_init_picture order = plogger_init_pictures order . sorting fixes from Import display to actually saving the files

+ Additional check for safe_mode workaround to see if ftp_connect function exists in compiled PHP installation before attempting the workaround

Files:

• trunk/lib/plogger/install_functions.php (modified) (4 diffs)

trunk/lib/plogger/install_functions.php

@@ -56 +56 @@
                 }
       
-                if (ini_get('safe_mode')==1) {
+                if (ini_get('safe_mode') && function_exists('ftp_connect')) {
                         //if safe_mode enabled, check the FTP information form inputs
                         if (empty($form['ftp_host'])) {
@@ -82 +82 @@
                 if (empty($errors)) {
                         $mysql_errors = check_mysql($form['db_host'],$form['db_user'],$form['db_pass'],$form['db_name']);
-                        if (ini_get('safe_mode')==1) {
+                        if (ini_get('safe_mode') && function_exists('ftp_connect')) {
                                 $ftp_errors = check_FTP($form['ftp_host'], $form['ftp_user'], $form['ftp_pass'], $form['ftp_path']);
                         }else{
@@ -104 +104 @@
                         );
                                 
-                        if (ini_get('safe_mode')==1) {
+                        if (ini_get('safe_mode') && function_exists('ftp_connect')) {
                                 $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']);
                         } else {
@@ -366 +366 @@
         $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 && !empty($ftp_host)) {
+        if (ini_get('safe_mode') && function_exists('ftp_connect') && !empty($ftp_host)) {
         //if safe_mode enabled, write the FTP workaround information to plog-config.php with db information
                 $cfg_file .= "\n";