Changeset 546 for trunk/admin/plog-admin-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/admin/plog-admin-functions.php (modified) (12 diffs)

trunk/admin/plog-admin-functions.php

@@ -29 +29 @@
        // Finish off the function
        closedir($dir);
+                         sort($tmp);
        return $tmp;
    }
@@ -35 +36 @@
 function add_picture($album_id,$tmpname,$filename,$caption,$desc) {
         global $config;
-
         
         $filename_parts = explode(".",strrev($filename),2);
@@ -881 +881 @@
 function makeDirs($strPath, $mode = 0777) //creates directory tree recursively
 {
-   if (ini_get('safe_mode')==1){
+   if (ini_get('safe_mode') && function_exists('ftp_connect')){
       return is_dir($strPath) or ( makeDirs(dirname($strPath), $mode) and FTP_makeDirs($strPath) );
    }else{
@@ -1170 +1170 @@
 
 function plog_picture_manager($id,$from,$limit) {
-        $output = '';
+  global $config;
+  $output = '';
 
         plogger_init_pictures(array(
@@ -1177 +1178 @@
                         'from' => $from,
                         'limit' => $limit,
+                        'sortby' => !empty($config['default_sortby']) ? $config['default_sortby'] : 'id',
+                        'sortdir' => !empty($config['default_sortdir']) ? $config['default_sortdir'] : 'ASC'
         ));
 
@@ -1199 +1202 @@
                         'from' => $from,
                         'limit' => $limit,
+                        'sortby' => !empty($config['default_sortby']) ? $config['default_sortby'] : 'id',
+                        'sortdir' => !empty($config['default_sortdir']) ? $config['default_sortdir'] : 'ASC'
         ));
         
@@ -1267 +1272 @@
 
 function plog_album_manager($id,$from,$limit) {
+  global $config;
         $output = '';
         
@@ -1274 +1280 @@
                 'limit' => $limit,
                 'all_albums' => 1,
-                'sortby' => 'id',
-                'sortdir' => 'asc'
+    'sortby' => !empty($config['album_sortby']) ? $config['album_sortby'] : 'id',
+                'sortdir' => !empty($config['album_sortdir']) ? $config['album_sortdir'] : 'ASC'
         ));
         
@@ -1298 +1304 @@
                 'limit' => $limit,
                 'all_albums' => 1,
-                'sortby' => 'id',
-                'sortdir' => 'asc'
+    'sortby' => !empty($config['album_sortby']) ? $config['album_sortby'] : 'id',
+                'sortdir' => !empty($config['album_sortdir']) ? $config['album_sortdir'] : 'ASC'
         ));
         
@@ -1344 +1350 @@
 
 function plog_collection_manager($from,$limit) {
-        $output = '';
+  global $config;
+  $output = '';
 
         plogger_init_collections(array(
@@ -1350 +1357 @@
                 'limit' => $limit,
                 'all_collections' => 1,
-                'sortby' => 'id',
-                'sortdir' => 'asc'
+    'sortby' => !empty($config['collection_sortby']) ? $config['collection_sortby'] : 'id',
+                'sortdir' => !empty($config['collection_sortdir']) ? $config['collection_sortdir'] : 'ASC'
         ));
         
@@ -1373 +1380 @@
                 'limit' => $limit,
                 'all_collections' => 1,
-                'sortby' => 'id',
-                'sortdir' => 'asc'
+    'sortby' => !empty($config['collection_sortby']) ? $config['collection_sortby'] : 'id',
+                'sortdir' => !empty($config['collection_sortdir']) ? $config['collection_sortdir'] : 'ASC'
         ));