Changeset 567 for trunk

Timestamp:

07/24/08 13:21:29 (4 months ago)

Author:

sidtheduck

Message:

+ Fix for undefined offset for THUMB_THEME in $thumbnail_config
+ Fix for mod_rewrite checkbox issue in admin section
- Removing greybox functionality to Gallery Preview and Plogger Forums from Admin tab links (now opens in new window)

Location:

trunk

Files:

• plog-admin/plog-admin.php (modified) (2 diffs)
• plog-admin/plog-themes.php (modified) (2 diffs)
• plog-includes/plog-functions.php (modified) (2 diffs)
• plog-load-config.php (modified) (2 diffs)

trunk/plog-admin/plog-admin.php

@@ -39 +39 @@
         $tabs['options']        = array('url' => 'plog-options.php','caption' => plog_tr('<em>O</em>ptions'));
         $tabs['themes']         = array('url' => 'plog-themes.php','caption' => plog_tr('<em>T</em>hemes'));
-        $tabs['view']           = array('url' => $config['gallery_url'],'caption' => plog_tr('<em>V</em>iew'), 'onclick' => 'return GB_show(\'Live Gallery\', \''.$config['gallery_url'].'\', 600, 800)');
-        $tabs['support']        = array('url' => 'http://www.plogger.org/forum/','caption' => plog_tr('<em>S</em>upport'), 'onclick' => 'return GB_show(\'Plogger Support Forum\', \'http://www.plogger.org/forum/\', 700, 800)');
+        $tabs['view']           = array('url' => $config['gallery_url'],'caption' => plog_tr('<em>V</em>iew'), 'target' => '_blank');
+        $tabs['support']        = array('url' => 'http://www.plogger.org/forum/','caption' => plog_tr('<em>S</em>upport'), 'target' => '_blank');
         $tabs['logout']         = array('url' => $_SERVER["PHP_SELF"].'?action=log_out','caption' => plog_tr('<em>L</em>og out'));
         // get the accesskey from the localization - it should be surrounded by <em> tags
@@ -91 +91 @@
                         if (!empty($data['onclick'])) $output .= ' onclick="'.$data['onclick'].'"';
                         if (!empty($data['accesskey'])) $output .= ' accesskey="'.$data['accesskey'].'"';
+                        if (!empty($data['target'])) $output .= ' target="'.$data['target'].'"';
                         $output .= ' href="' . $data['url'] . '">' . $data['caption'] . '</a></li>';
                 };

trunk/plog-admin/plog-themes.php

@@ -5 +5 @@
 require_once(PLOGGER_DIR."plog-admin/plog-admin-functions.php");
 
-global $inHead;
-global $config;
+global $inHead, $config, $thumbnail_config;
 
 function read_dir($path){
@@ -82 +81 @@
                 if ($counter%2 == 0) $table_row_color = "color-1";
                 else $table_row_color = "color-2";
-                
-                // generate preview
+
+                // generate small preview thumb, update thumb if preview.png has been updated
+                $timestamp = @filemtime($theme_dir . $theme_folder_basename . "/preview.png");
+                $thumbnail_config[THUMB_THEME]['timestamp'] = $timestamp;
                 $preview_thumb = generate_thumb($theme_folder_name . "preview.png", $theme_name, THUMB_THEME);
+
+                // generate large Lightbox preview thumb, update thumb if preview.png has been updated
+                $thumbnail_config[THUMB_LARGE]['timestamp'] = $timestamp;
                 $preview_thumb_large = generate_thumb($theme_folder_name . "preview.png", $theme_name, THUMB_LARGE);
-                
+
                 // start a new table row (alternating colors)
                 if ($config["theme_dir"] == $theme_folder_basename)

trunk/plog-includes/plog-functions.php

@@ -470 +470 @@
 
         if ($config["embedded"] == 0) {
-        print "\t<title>" . get_head_title() . "</title>";
+                print "\t<title>" . get_head_title() . "</title>";
         }
         print "\n\t" . '<meta http-equiv="Content-Type" content="text/html;charset=' . $config['charset'] . '" />';
@@ -1175 +1175 @@
         $rv = '';
 
-        if ($config['use_mod_rewrite']){
+        if ($config['use_mod_rewrite'] && $level != "admin"){
                 $args = '';
                 // I need to give additional arguments to the url-s

trunk/plog-load-config.php

@@ -86 +86 @@
 // had to update this for new use of links without mod_rewrite turned on (only affects the View gallery greybox in Admin)
 if (strpos($config['baseurl'], "plog-admin/")) {
-        $config['use_mod_rewrite'] = 0;
         $config['baseurl'] = substr($config['baseurl'], 0, strpos($config['baseurl'], "plog-admin/"));
 }
@@ -127 +126 @@
         'disabled' => $row['disabled']);
 }
+
+// need to add the new theme preview thumbnail array
+$thumbnail_config[5] = array(
+        'filename_prefix' => 'theme-',
+        'size' => 150,
+        'timestamp' => 0,
+        'disabled' => 0);
 
 // debugging functions