[php-blog-cvs] serendipity/include functions_config.inc.php,1.19,1.20 functions_images.inc.php,1.28,1.29

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13112/include

Modified Files:
	functions_config.inc.php functions_images.inc.php 
Log Message:
Remember last state of media library.


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- functions_images.inc.php	6 Feb 2005 01:04:52 -0000	1.28
+++ functions_images.inc.php	9 Feb 2005 11:11:25 -0000	1.29
@@ -768,45 +768,46 @@
 function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL, $show_upload = false) {
     global $serendipity;
     $sort_row_interval = array(8, 16, 50, 100);
+    $sortParams        = array('perpage', 'order', 'ordermode');
+    $importParams      = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage');
+    $extraParems       = '';
 
-    $perPage = (isset($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]);
-    $start   = ($page-1) * $perPage;
-
-    $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(
-                                  $start,
-                                  $perPage,
-                                  $totalImages, // Passed by ref
-                                  (isset($serendipity['GET']['sortorder']['order']) ? $serendipity['GET']['sortorder']['order'] : false),
-                                  (isset($serendipity['GET']['sortorder']['ordermode']) ? $serendipity['GET']['sortorder']['ordermode'] : false),
-                                  (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '')
-    );
-
-    $extraParems = '';
-
-    $importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage');
     foreach($importParams AS $importParam) {
         if (isset($serendipity['GET'][$importParam])) {
             $extraParems .= 'serendipity[' . $importParam . ']='. $serendipity['GET'][$importParam] .'&';
         }
     }
 
-    if (isset($serendipity['GET']['only_path']) && !empty($serendipity['GET']['only_path']) ) {
-        $extraParems .= 'serendipity[only_path]='. $serendipity['GET']['only_path'] .'&';
-        $serendipity['GET']['only_path'] = serendipity_uploadSecure($serendipity['GET']['only_path'], true);
+    foreach($sortParams AS $sortParam) {
+        serendipity_restoreVar($serendipity['COOKIE']['sortorder_' . $sortParam], $serendipity['GET']['sortorder'][$sortParam]);
+        serendipity_JSsetCookie('sortorder_' . $sortParam, $serendipity['GET']['sortorder'][$sortParam]);
+        $extraParems .= 'serendipity[sortorder]['. $sortParam .']='. $serendipity['GET']['sortorder'][$sortParam] .'&';
     }
 
-    foreach ( (array)$serendipity['GET']['sortorder'] as $k => $v ) {
-        $extraParems .= 'serendipity[sortorder]['. $k .']='. $v .'&';
+    serendipity_restoreVar($serendipity['COOKIE']['only_path'], $serendipity['GET']['only_path']);
+    serendipity_JSsetCookie('only_path', $serendipity['GET']['only_path']);
+    if (!empty($serendipity['GET']['only_path'])) {
+        $extraParems .= 'serendipity[only_path]='. $serendipity['GET']['only_path'] .'&';
+        $serendipity['GET']['only_path'] = serendipity_uploadSecure($serendipity['GET']['only_path'], true);
     }
 
-    $pages = ceil($totalImages/$perPage);
-    $linkPrevious  = '?'. $extraParems .'serendipity[page]=' . ($page-1);
-    $linkNext      = '?'. $extraParems .'serendipity[page]=' . ($page+1);
-
-    $sort_order = serendipity_getImageFields();
+    $perPage = (isset($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]);
+    $start   = ($page-1) * $perPage;
 
-    $paths = serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']);
+    $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(
+                                  $start,
+                                  $perPage,
+                                  $totalImages, // Passed by ref
+                                  (isset($serendipity['GET']['sortorder']['order']) ? $serendipity['GET']['sortorder']['order'] : false),
+                                  (isset($serendipity['GET']['sortorder']['ordermode']) ? $serendipity['GET']['sortorder']['ordermode'] : false),
+                                  (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '')
+    );
 
+    $pages         = ceil($totalImages / $perPage);
+    $linkPrevious  = '?' . $extraParems . 'serendipity[page]=' . ($page-1);
+    $linkNext      = '?' . $extraParems . 'serendipity[page]=' . ($page+1);
+    $sort_order    = serendipity_getImageFields();
+    $paths         = serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']);
 
     if (is_null($lineBreak)) {
         $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));

Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- functions_config.inc.php	27 Jan 2005 15:31:31 -0000	1.19
+++ functions_config.inc.php	9 Feb 2005 11:11:24 -0000	1.20
@@ -193,6 +193,24 @@
     }
 }
 
+function serendipity_restoreVar(&$source, &$target) {
+    global $serendipity;
+    
+    if (isset($source) && !isset($target)) {
+        $target = $source;
+        return true;
+    }
+
+    return false;
+}
+
+function serendipity_JSsetCookie($name, $value) {
+    $name  = str_replace('"', '\"', $name);
+    $value = str_replace('"', '\"', $value);
+
+    echo '<script type="text/javascript">SetCookie("' . $name . '", "' . $value . '")</script>' . "\n";
+}
+
 function serendipity_setCookie($name,$value) {
     global $serendipity;