Index: skins/grey/settings.css
===================================================================
--- skins/grey/settings.css (Revision 2)
+++ skins/grey/settings.css (Revision 3)
@@ -94,7 +94,7 @@
#settings ._host {
text-align: right;
- border-bottom: 2px solid #eee;
+ border-bottom: 2px solid #aaa;
}
/* A notification/warning */
@@ -115,3 +115,33 @@
border: 2px solid #999;
border-top: none;
}
+
+ #settings ._content input._text {
+ margin: 2px;
+ padding: 2px;
+ border: 1px solid #333333;
+ }
+
+ #settings ._content input._button {
+ margin: 2px;
+ padding: 2px;
+ border: 1px solid #333333;
+ color: #DDDDDD;
+ }
+
+ #settings ._content table {
+ width: 100%;
+ }
+ #settings ._content table th, #settings ._content table td {
+ padding: .5em;
+ }
+
+ #settings ._content th, #settings ._content td {
+ text-align: right;
+ font-weight: normal;
+ white-space: nowrap;
+ }
+
+ #settings ._content tr._sep th, #settings ._content tr._sep td {
+ border-bottom: 1px solid #304943;
+ }
Index: modules/gallery/set_prefs.php
===================================================================
--- modules/gallery/set_prefs.php (Revision 2)
+++ modules/gallery/set_prefs.php (Revision 3)
@@ -12,130 +12,217 @@
* @subpackage Weather
/**/
-// =======================================================
+
// Load all of the known mythtv frontend hosts
-$Settings_Hosts = array('' => t('MythWeb Session'));
-$sh = $db->query('SELECT DISTINCT hostname FROM settings WHERE value="locale" ORDER BY hostname');
+$Settings_Hosts = getGalleryHostnames();
-// add all the found hosts into an array
-while (list($host) = $sh->fetch_row())
+// update the values in the database if necessary
+saveGalleryConfig( $Settings_Hosts );
+loadGalleryConfig();
+
+
+// Load the available configuration from the session variable
+// or if this one is empty then form the database
+function loadGalleryConfig()
{
- if (empty($host))
- continue;
- $Settings_Hosts[$host] = $host;
+ $_SESSION['gallery']['image_path'] = getGalleryImagePath();
+ $_SESSION['gallery']['cache_path'] = getGalleryCachePath();
+ $_SESSION['gallery']['default_viewsize'] = getGalleryDefaultViewSize();
+ $_SESSION['gallery']['screen_width'] = getGalleryScreenWidth();
+ $_SESSION['gallery']['viewsizes'] = getGalleryViewSizes();
+ $_SESSION['gallery']['valid_image_files'] = getGalleryValidImageFiles();
}
-$sh->finish();
-// Make sure we have a valid host selected
-if (!isset( $Settings_Hosts[$_SESSION['settings']['host']]) )
+// Load all of the known mythtv frontend hosts
+function getGalleryHostnames()
+{
+ $Settings_Hosts = array('' => t('MythWeb Session'));
+ global $db;
+ $sh = $db->query('SELECT DISTINCT hostname FROM settings WHERE value="locale" ORDER BY hostname');
+
+ // add all the found hosts into an array
+ while (list($host) = $sh->fetch_row())
+ {
+ if (empty($host))
+ continue;
+ $Settings_Hosts[$host] = $host;
+ }
+ $sh->finish();
+ return $Settings_Hosts;
+}
+
+
+// update the values in the database if necessary
+function saveGalleryConfig( $Settings_Hosts )
{
- // we have no valid host, reset the array
- $_SESSION['settings']['host'] = reset(array_keys($Settings_Hosts));
-} else {
- // we have a valid host, check if the data should be saved
- if ($_POST['save'] && isset($_POST['host']))
+ // Make sure we have a valid host selected
+ if (!isset( $Settings_Hosts[$_SESSION['settings']['host']]) )
{
- // Changing settings for this MythWeb session
- if (empty($_POST['host']))
+ // we have no valid host, reset the array
+ $_SESSION['settings']['host'] = reset(array_keys($Settings_Hosts));
+ } else {
+ // we have a valid host, check if the data should be saved
+ if ($_POST['save'] && isset($_POST['host']))
{
- // save the image path in the session variable
- $_SESSION['gallery']['image_path'] = $_POST['image_path'];
- } else {
- // save the settings in the database
- $galleryConfig->setImagePath( $_POST['image_path'], $_POST['host'] );
+ // Changing settings for this MythWeb session
+ if (empty($_POST['host']))
+ {
+ // save the image path in the session variable
+ $_SESSION['gallery']['image_path'] = $_POST['image_path'];
+ $_SESSION['gallery']['cache_path'] = $_POST['cache_path'];
+ $_SESSION['gallery']['default_viewsize'] = $_POST['default_viewsize'];
+ $_SESSION['gallery']['screen_width'] = $_POST['screen_width'];
+ $_SESSION['gallery']['viewsizes'] = $_POST['viewsizes'];
+ $_SESSION['gallery']['valid_image_files'] = $_POST['valid_image_files'];
+ } else {
+ // save the settings in the database
+ setGalleryImagePath( $_POST['image_path'], $_POST['host'] );
+ setGalleryCachePath( $_POST['cache_path'], $_POST['host'] );
+ setGalleryDefaultViewSize( $_POST['default_viewsize'], $_POST['host'] );
+ setGalleryScreenWidth( $_POST['screen_width'], $_POST['host'] );
+ setGalleryViewSizes( $_POST['viewsizes'], $_POST['host'] );
+ setGalleryValidImageFiles( $_POST['valid_image_files'],$_POST['host'] );
+ }
+ // Make sure the session host gets updated to the posted one.
+ $_SESSION['settings']['host'] = $_POST['host'];
}
- // Make sure the session host gets updated to the posted one.
- $_SESSION['settings']['host'] = $_POST['host'];
}
}
+// the absolute path where the images are
+// get it from the database or the session variable
+function getGalleryImagePath()
+{
+ global $db;
+ if (empty($_SESSION['settings']['host'])) {
+ $imagePath = _or($_SESSION['gallery']['image_path'], '/tmp');
+ } else {
+ $imagePath = $db->query_col('SELECT data FROM settings
+ WHERE value="GalleryDir" AND hostname=?', $_SESSION['settings']['host']);
+ }
+ return $imagePath;
+}
-// Display the gui for the settings
-$galleryConfig = new GalleryConfig();
+// directory where the cached images are stored
+// this directory is relative to the htdocs directory
+function getGalleryCachePath()
+{
+ global $db;
+ if (empty($_SESSION['settings']['host'])) {
+ $cachePath = _or($_SESSION['gallery']['cache_path'], '/mythweb/data/cache');
+ } else {
+// $cachePath = $db->query_col('SELECT data FROM settings
+// WHERE value="GalleryCachePath" AND hostname=?', $_SESSION['settings']['host']);
+ }
+ return $cachePath;
+}
-class GalleryConfig
+// defines the default view mode
+// default is 4 columns and 4 rows per page
+function getGalleryDefaultViewSize()
{
- // variable that holds the configuration data from gallery.conf
- var $config;
-
- // =======================================================
- // constructor
- function GalleryConfig()
- {
- $this->config = array();
- // the absolute path where the images are
- $this->config['image_path'] = $this->getImagePath();
- // directory where the cached images are stored
- // this directory is relative to the htdocs directory
- $this->config['cache_path'] = '/mythweb/data/cache';
- // defines the default view mode
- // default is 4 columns and 4 rows per page
- $this->config['default_viewsize'] = '4,3';
- // width if the screen-200 (example 1024-200)
- // this is needed to calculate the width of the images
- $this->config['screen_width'] = '1024';
- // columns and rows that are shown on one page
- // ; separates another mode
- $this->config['viewsizes'] = '5,4 ; 4,4 ; 4,3 ; 3,3 ; 2,2 ; 1,1';
- // image extensions that will be shown, everything else
- // will not work, currently there four are supported
- $this->config['valid_image_files'] = 'jpg,png,gif,bmp';
+ global $db;
+ if (empty($_SESSION['settings']['host'])) {
+ $defaultViewSize = _or($_SESSION['gallery']['default_viewsize'], '4,3');
+ } else {
+// $defaultViewSize = $db->query_col('SELECT data FROM settings
+// WHERE value="GalleryDefaultViewSize" AND hostname=?', $_SESSION['settings']['host']);
}
+ return $defaultViewSize;
+}
- // =======================================================
- function getConfig() {
- return $this->config;
- }
- // show the table with the configuration
- function showConfig()
- {
- echo '';
+// width if the screen-200 (example 1024-200)
+// this is needed to calculate the width of the images
+function getGalleryScreenWidth()
+{
+ global $db;
+ if (empty($_SESSION['settings']['host'])) {
+ $screenWidth = _or($_SESSION['gallery']['screen_width'], '1024');
+ } else {
+// $screenWidth = $db->query_col('SELECT data FROM settings
+// WHERE value="GalleryScreenWidth" AND hostname=?', $_SESSION['settings']['host']);
}
+ return $screenWidth;
+}
- // get the image path from the database
- function getImagePath()
- {
- global $db;
- if (empty($_SESSION['settings']['host'])) {
- $imagePath = _or($_SESSION['gallery']['image_path'], '');
- } else {
- $imagePath = $db->query_col('SELECT data FROM settings
- WHERE value="GalleryDir"
- AND hostname=?', $_SESSION['settings']['host']);
- }
- return $imagePath;
+
+// columns and rows that are shown on one page, ; separates another mode
+function getGalleryViewSizes()
+{
+ global $db;
+ if (empty($_SESSION['settings']['host'])) {
+ $viewSizes = _or($_SESSION['gallery']['viewsizes'], '5,4 ; 4,4 ; 4,3 ; 3,3 ; 2,2 ; 1,1');
+ } else {
+// $viewSizes = $db->query_col('SELECT data FROM settings
+// WHERE value="GalleryViewSizes" AND hostname=?', $_SESSION['settings']['host']);
}
+ return $viewSizes;
+}
- // save the image path in the database
- function setImagePath( $image_path, $host )
- {
- $db->query('UPDATE settings SET data = ?
- WHERE value="GalleryDir" AND hostname=?', $image_path, $host);
-
+
+// image extensions that will be shown, everything else
+// will not work, currently there four are supported
+function getGalleryValidImageFiles()
+{
+ global $db;
+ if (empty($_SESSION['settings']['host'])) {
+ $validImageFiles = _or($_SESSION['gallery']['valid_image_files'], 'jpg,png,gif,bmp');
+ } else {
+// $validImageFiles = $db->query_col('SELECT data FROM settings
+// WHERE value="GalleryValidImageFiles" AND hostname=?', $_SESSION['settings']['host']);
}
+ return $validImageFiles;
}
+// save the image path in the database
+function setGalleryImagePath( $imagePath, $host )
+{
+ global $db;
+ $db->query('UPDATE settings SET data = ?
+ WHERE value="GalleryDir" AND hostname=?', $imagePath, $host);
+}
+
+function setGalleryCachePath( $cachePath, $host )
+{
+// global $db;
+// $db->query('UPDATE settings SET data = ?
+// WHERE value="GalleryCachePath" AND hostname=?', $cachePath, $host);
+}
+
+
+function setGalleryDefaultViewSize( $defaultViewSize, $host )
+{
+// global $db;
+// $db->query('UPDATE settings SET data = ?
+// WHERE value="GalleryDefaultViewSize" AND hostname=?', $defaultViewSize, $host);
+}
+
+
+function setGalleryScreenWidth( $screenWidth, $host )
+{
+// global $db;
+// $db->query('UPDATE settings SET data = ?
+// WHERE value="GalleryScreenWidth" AND hostname=?', $screenWidth, $host);
+}
+
+
+function setGalleryViewSizes( $viewSizes, $host )
+{
+// global $db;
+// $db->query('UPDATE settings SET data = ?
+// WHERE value="GalleryViewSizes" AND hostname=?', $viewSizes, $host);
+}
+
+
+function setGalleryValidImageFiles( $validImageFiles, $host )
+{
+// global $db;
+// $db->query('UPDATE settings SET data = ?
+// WHERE value="GalleryValidImageFiles" AND hostname=?', $validImageFiles, $host);
+}
+
+
Index: modules/gallery/tmpl/default/gallery_config.php
===================================================================
--- modules/gallery/tmpl/default/gallery_config.php (Revision 2)
+++ modules/gallery/tmpl/default/gallery_config.php (Revision 3)
@@ -1,78 +0,0 @@
- config = array();
- // the absolute path where the images are
- $this->config['image_path'] = $this->getImagePath();
- // directory where the cached images are stored
- // this directory is relative to the htdocs directory
- $this->config['cache_path'] = '/mythweb/data/cache';
- // defines the default view mode
- // default is 4 columns and 4 rows per page
- $this->config['default_viewsize'] = '4,3';
- // width if the screen-200 (example 1024-200)
- // this is needed to calculate the width of the images
- $this->config['screen_width'] = '1024';
- // columns and rows that are shown on one page
- // ; separates another mode
- $this->config['viewsizes'] = '5,4 ; 4,4 ; 4,3 ; 3,3 ; 2,2 ; 1,1';
- // image extensions that will be shown, everything else
- // will not work, currently there four are supported
- $this->config['valid_image_files'] = 'jpg,png,gif,bmp';
- }
-
- // =======================================================
- function getConfig() {
- return $this->config;
- }
-
- // show the table with the configuration
- function showConfig()
- {
- echo '';
- }
-
-
- // get the image path from the database
- function getImagePath()
- {
- global $db;
- if (empty($_SESSION['settings']['host'])) {
- $imagePath = _or($_SESSION['gallery']['image_path'], '');
- } else {
- $imagePath = $db->query_col('SELECT data FROM settings
- WHERE value="GalleryDir"
- AND hostname=?', $_SESSION['settings']['host']);
- }
- return $imagePath;
- }
-
-}
-
-?>
\ Kein Zeilenvorschub am Ende der Datei
Index: modules/gallery/tmpl/default/set_prefs.php
===================================================================
--- modules/gallery/tmpl/default/set_prefs.php (Revision 2)
+++ modules/gallery/tmpl/default/set_prefs.php (Revision 3)
@@ -13,7 +13,84 @@
*
/**/
+
// Display the gui for the settings
-$galleryConfig->showConfig();
+$galleryConfigTheme = new GalleryConfigTheme();
+$galleryConfigTheme->showConfig();
+
+
+class GalleryConfigTheme
+{
+ function GalleryConfigTheme()
+ {
+
+ }
+
+ function showConfig()
+ {
+ echo '';
+ }
+}
+
?>
\ Kein Zeilenvorschub am Ende der Datei
Index: modules/gallery/tmpl/default/gallery.php
===================================================================
--- modules/gallery/tmpl/default/gallery.php (Revision 2)
+++ modules/gallery/tmpl/default/gallery.php (Revision 3)
@@ -20,10 +20,10 @@
// Print the page header
require 'modules/_shared/tmpl/'.tmpl.'/header.php';
-require_once tmpl_dir.'gallery_config.php';
+// require_once tmpl_dir.'set_prefs.php';
// Print the gallery part
-$gallery = new Gallery($data, $main);
+$gallery = new Gallery();
$gallery->start();
// Print the page footer
@@ -31,23 +31,32 @@
class Gallery {
- var $data;
- var $main;
var $config;
- function Gallery($data, $main) {
- $this->data = $data;
- $this->main = $main;
+ function Gallery() {
+
}
// =======================================================
function start() {
// load default configuration
- $galleryConfig = new GalleryConfig();
- $this->config = $galleryConfig->getConfig();
+ $this->config['image_path'] = $_SESSION['gallery']['image_path'];
+ $this->config['cache_path'] = $_SESSION['gallery']['cache_path'];
+ $this->config['default_viewsize'] = $_SESSION['gallery']['default_viewsize'];
+ $this->config['screen_width'] = $_SESSION['gallery']['screen_width'];
+ $this->config['viewsizes'] = $_SESSION['gallery']['viewsizes'];
+ $this->config['valid_image_files'] = $_SESSION['gallery']['valid_image_files'];
+
+// echo $this->config['image_path'] ." ";
+// echo $this->config['cache_path'] ." ";
+// echo $this->config['default_viewsize'] ." ";
+// echo $this->config['screen_width'] ." ";
+// echo $this->config['viewsizes'] ." ";
+// echo $this->config['valid_image_files'] ." ";
+
// the current selected directory where the cached images are stored
- $current_path = $this->getImagePath();
+ $current_path = $this->getCurrentImagePath();
// the path to the real images
$image_path = $this->config['image_path'];
// the filename of a selected image
@@ -56,7 +65,7 @@
$image_viewsize = $this->getImageViewSize();
// get the image index for the viewsize medium
$image_index = $this->getImageIndex();
- // get the contents of the folders
+ // get the contents of the folders
$folderList = $this->getFolderList( $current_path );
// check what kind of images should be displayed
if ($image_viewsize == 'fullsize') {
@@ -109,19 +118,19 @@
// =======================================================
- function getImagePath() {
+ function getCurrentImagePath() {
switch ($_SERVER['REQUEST_METHOD']) {
case 'GET':
- $current_path = stripslashes($_GET[path]);
+ $current_path = stripslashes($_GET['path']);
break;
case 'POST':
- $current_path = stripslashes($_POST[path]);
+ $current_path = stripslashes($_POST['path']);
break;
}
if (!is_dir($current_path) ) {
$current_path = $this->config['image_path'];
}
- return $current_path;
+ return $current_path;
}
// =======================================================
@@ -621,3 +630,68 @@
// =======================================================
}
+
+
+// class GalleryConfig
+// {
+// // variable that holds the configuration data from gallery.conf
+// var $config;
+//
+// // =======================================================
+// // constructor
+// function GalleryConfig()
+// {
+// $this->config = array();
+// // the absolute path where the images are
+// $this->config['image_path'] = $this->getImagePath();
+// // directory where the cached images are stored
+// // this directory is relative to the htdocs directory
+// $this->config['cache_path'] = '/mythweb/data/cache';
+// // defines the default view mode
+// // default is 4 columns and 4 rows per page
+// $this->config['default_viewsize'] = '4,3';
+// // width if the screen-200 (example 1024-200)
+// // this is needed to calculate the width of the images
+// $this->config['screen_width'] = '1024';
+// // columns and rows that are shown on one page
+// // ; separates another mode
+// $this->config['viewsizes'] = '5,4 ; 4,4 ; 4,3 ; 3,3 ; 2,2 ; 1,1';
+// // image extensions that will be shown, everything else
+// // will not work, currently there four are supported
+// $this->config['valid_image_files'] = 'jpg,png,gif,bmp';
+// }
+//
+// // =======================================================
+// function getConfig() {
+// return $this->config;
+// }
+//
+// // show the table with the configuration
+// function showConfig()
+// {
+// echo '';
+// }
+//
+//
+//
+// }
Index: modules/_shared/lang/German.lang
===================================================================
--- modules/_shared/lang/German.lang (Revision 2)
+++ modules/_shared/lang/German.lang (Revision 3)
@@ -217,6 +217,8 @@
Deaktiviert
"Default"
Standard
+"Default view size"
+ Standardansicht
"Delete"
Löschen
"delete"
@@ -351,6 +353,8 @@
"Hide"
"High"
Max
+"Horizontal screen resolution"
+ Horizontale Bildschirmauflösung
"Host"
"Hosted by"
"Hosts"
@@ -407,6 +411,10 @@
Dauer
"Length (min)"
Dauer (Min.)
+"List of allowed image formats"
+ Liste der erlaubten Bildformate
+"List of available view sizes"
+ Liste der möglichen Ansichten
"Listing "Jump to""
TV Programm "Gehe zu"
"Listing Time Key"
@@ -518,6 +526,8 @@
Produktion
"Originally aired between"
"Override"
+"Path where the thumbnails are"
+ Thumbnails speichern unter
"Part $1 of $2"
Teil $1 von $2
"Past Month"
Index: modules/_shared/lang/English.lang
===================================================================
--- modules/_shared/lang/English.lang (Revision 2)
+++ modules/_shared/lang/English.lang (Revision 3)
@@ -142,6 +142,7 @@
"Date Formats"
"Deactivated"
"Default"
+"Default view size"
"Delete"
"delete"
"Delete $1"
@@ -199,6 +200,8 @@
"Found %s results for '%s'"
"freqid"
"Friday"
+"Gallery"
+"Gallery image path"
"Generic Episodes"
"generic_date"
%a %b %e, %Y
@@ -222,6 +225,7 @@
"HDTV"
"Hide"
"High"
+"Horizontal screen resolution"
"Host"
"Hosted by"
"Hosts"
@@ -265,6 +269,8 @@
"length"
"Length"
"Length (min)"
+"List of allowed image formats"
+"List of available view sizes"
"Listing "Jump to""
"Listing Time Key"
"Listings"
@@ -346,6 +352,7 @@
"Past Month"
"Past Week"
"Past Year"
+"Path where the thumbnails are"
"People"
"People Search"
"Percent of time spent recording"