From adf40044e9d1bce2b19d6602637bbb608412fcd9 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 29 Mar 2008 12:48:17 +0100 Subject: speedup lightbox2 resizing antimation Signed-off-by: Andreas Unterkircher --- lightbox2/js/lightbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightbox2/js/lightbox.js b/lightbox2/js/lightbox.js index b62415b..25c3d47 100755 --- a/lightbox2/js/lightbox.js +++ b/lightbox2/js/lightbox.js @@ -52,7 +52,7 @@ LightboxOptions = Object.extend({ overlayOpacity: 0.8, // controls transparency of shadow overlay animate: true, // toggles resizing animations - resizeSpeed: 7, // controls the speed of the image resizing animations (1=slowest and 10=fastest) + resizeSpeed: 9, // controls the speed of the image resizing animations (1=slowest and 10=fastest) borderSize: 10, //if you adjust the padding in the CSS, you will need to update this variable -- cgit v1.2.3-18-g5258 From fb7df61d1e9b77181a69169311133df355e66eea Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sun, 30 Mar 2008 09:52:53 +0200 Subject: issue114, pimp AJAX-loading notification Signed-off-by: Andreas Unterkircher --- CHANGELOG | 1 + resources/loading.gif | Bin 0 -> 2767 bytes themes/default/stylesheet.css | 9 +++++++++ themes/default/templates/index.tpl | 6 ++++++ 4 files changed, 16 insertions(+) create mode 100644 resources/loading.gif diff --git a/CHANGELOG b/CHANGELOG index e226e78..8de2e0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ phpfspot (1.4) * feature, lightbox2 for photo preview out of the photo index. * feature, a bit more color for tag-cloud. * bug, SQlite temporary directory can now be set in phpfspot_cfg.php + * bug, modify AJAX-loading notification. Standard HTML_AJAX is getting overlayed. -- Andreas Unterkircher Sat, 29 Mar 2008 11:00:00 +0100 diff --git a/resources/loading.gif b/resources/loading.gif new file mode 100644 index 0000000..f864d5f Binary files /dev/null and b/resources/loading.gif differ diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css index ebe9892..4a127e8 100644 --- a/themes/default/stylesheet.css +++ b/themes/default/stylesheet.css @@ -163,6 +163,15 @@ div.thumb a.thumblink:hover { margin-right: 20px; } +#HTML_AJAX_LOADING { + position: fixed; + z-index: 1000; + top: 80px; + right: 10px; + background-color: #ffffff; + padding: 10px; +} + #available_tags,#selected_tags { clip: auto; overflow: auto; diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl index be8ba6c..0bd7a7b 100644 --- a/themes/default/templates/index.tpl +++ b/themes/default/templates/index.tpl @@ -1,6 +1,12 @@ {include file="header.tpl"} + + +
+   Loading... +
+
-- cgit v1.2.3-18-g5258 From 10509074c0b749564f0a0327f3b11fda994d36c1 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sun, 30 Mar 2008 10:02:47 +0200 Subject: issue113, fix getting EXIF data right in time for the single-photo view Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 3b4a62e..b375ffd 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -483,8 +483,11 @@ class PHPFSPOT { $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo); } + /* get mime-type, height and width from the original photo */ + $info = getimagesize($orig_path); + /* get EXIF information if JPEG */ - if($details['mime'] == "image/jpeg") { + if($info['mime'] == "image/jpeg") { $meta = $this->get_meta_informations($orig_path); } @@ -492,7 +495,6 @@ class PHPFSPOT { if(isset($meta['ExifImageWidth'])) { $meta_res = $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']; } else { - $info = getimagesize($orig_path); $meta_res = $info[0] ."x". $info[1]; } @@ -516,13 +518,13 @@ class PHPFSPOT { return; } - $info = getimagesize($thumb_path); + $info_thumb = getimagesize($thumb_path); $this->tmpl->assign('description', $details['description']); $this->tmpl->assign('image_name', $this->parse_uri($details['uri'], 'filename')); - $this->tmpl->assign('width', $info[0]); - $this->tmpl->assign('height', $info[1]); + $this->tmpl->assign('width', $info_thumb[0]); + $this->tmpl->assign('height', $info_thumb[1]); $this->tmpl->assign('ExifMadeOn', $meta_date); $this->tmpl->assign('ExifMadeWith', $meta_make); $this->tmpl->assign('ExifOrigResolution', $meta_res); -- cgit v1.2.3-18-g5258 From 06e07c45d3ae47d1126230ca5bae0f9d5a708e15 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Tue, 1 Apr 2008 19:18:53 +0200 Subject: issue114, further pimped loading-notification Signed-off-by: Andreas Unterkircher --- themes/default/stylesheet.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css index 4a127e8..e9a505c 100644 --- a/themes/default/stylesheet.css +++ b/themes/default/stylesheet.css @@ -166,10 +166,13 @@ div.thumb a.thumblink:hover { #HTML_AJAX_LOADING { position: fixed; z-index: 1000; - top: 80px; + top: 90px; right: 10px; background-color: #ffffff; padding: 10px; + -moz-border-radius: 1em; + border-radius: 1em; + border: dashed 1px #aaaaaa; } #available_tags,#selected_tags { -- cgit v1.2.3-18-g5258 From deb4800cd1e9b52f1c650d8ef0a03bcabb74ebb3 Mon Sep 17 00:00:00 2001 From: Fabian Linzberger Date: Mon, 7 Apr 2008 11:05:29 +0200 Subject: fix spelling in welcome.tpl Signed-off-by: Fabian Linzberger --- themes/default/templates/welcome.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl index fe079a0..4629fda 100644 --- a/themes/default/templates/welcome.tpl +++ b/themes/default/templates/welcome.tpl @@ -19,7 +19,7 @@
- You can addept this welcome page in the file "welcome.tpl" in the template
+ You can adapt this welcome page in the file "welcome.tpl" in the template
directory of your current theme.
-- cgit v1.2.3-18-g5258 From 24a72f524227df4b33b663501422764cd2a48ee8 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 09:58:20 +0200 Subject: add GPL header and many comments to phpfspot.js Signed-off-by: Andreas Unterkircher --- phpfspot.js | 296 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 261 insertions(+), 35 deletions(-) diff --git a/phpfspot.js b/phpfspot.js index f9f9703..b5f6e98 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -1,5 +1,35 @@ +/*************************************************************************** + * + * Copyright (c) by Andreas Unterkircher, unki@netshadow.at + * All rights reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + ***************************************************************************/ + +/** + * display image + * + * this function will be called by client and fetches + * the single-photo view via AJAX from the server. + * Furthermore it will scrollup the browser to the top + * position so the image become visibile immediatley. + */ function showImage(id, scrollup) { + /* is phpfspot skeleton really displayed? */ if(!document.getElementById('content')) return; @@ -10,6 +40,7 @@ function showImage(id, scrollup) content.innerHTML = ""; } + /* fetch single-photo view from server */ HTML_AJAX.replace(content, encodeURI('rpc.php?action=showphoto&id=' + id)); /* scroll the window up to the top */ @@ -21,8 +52,16 @@ function showImage(id, scrollup) delete(origHeight); origHeight = undefined; delete(origWidth); origWidth = undefined; delete(photo_details_pos); photo_details_pos = undefined; -} +} // showImage() + +/** + * scroll browser to the last shown photo + * + * this function will be called when user returns from single-photo + * to the photo index. It will scroll down the window (if possible) + * to the position of the last shown photo. + */ function moveToThumb(thumb_id) { if(thumb_id == undefined) @@ -34,6 +73,13 @@ function moveToThumb(thumb_id) } // moveToThumb() +/** + * return position of object + * + * this function returns the position of an object. + * depending on the parameter 'direction' it will either + * return the X or Y position. + */ function findPos(obj, direction) { var cur = 0; if (obj.offsetParent) { @@ -45,14 +91,30 @@ function findPos(obj, direction) { } while (obj = obj.offsetParent); } return [cur]; -} +} // findPos() + +/** + * opens the credits page + */ function showCredits() { var credits = document.getElementById("content"); credits.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=showcredits')); -} +} // showCredits() + +/** + * tag-selection handling + * + * this function is getting called by client to either + * - add + ∗ - delete + * - modify tag-match condition + * + * It will then fetch the result from the server via AJAX + * and updates the tag-selection. + */ function Tags(mode, id) { var objTemp = new Object(); @@ -85,22 +147,44 @@ function Tags(mode, id) } // Tags() +/** + * update available-tags tag-cloud + * + * this function queries an actual version of the tag-cloud + * for the available (not-selected) tags from the server via + * AJAX. + */ function refreshAvailableTags() { // update available tags var avail_tags = document.getElementById('available_tags'); avail_tags.innerHTML = "Loading..."; avail_tags.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=show_available_tags')); -} +} // refreshAvailableTags() + +/** + * update selected-tags list + * + * this function queries an actual version of the tag-list + * for the selected tags from the server via AJAX. + */ function refreshSelectedTags() { // update selected tags var selected_tags = document.getElementById("selected_tags"); selected_tags.innerHTML = "Loading..."; selected_tags.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=show_selected_tags')); -} +} // refreshSelectedTags() + +/** + * show photo index + * + * this function will fetch the photo-index view from + * the server via AJAX. It's also used to browse through + * the photo-index pages + */ function showPhotoIndex(begin_with, last_photo) { var url = "rpc.php?action=show_photo_index"; @@ -113,26 +197,45 @@ function showPhotoIndex(begin_with, last_photo) } // showPhotoIndex() -// if photo index is currently shown, refresh it +/** + * update photo index + * + * this function will be called, to request a refresh of the + * photo index. this, for example, can be caused, when changing + * the tag-selection. + */ function refreshPhotoIndex() { + /* only invoke showPhotoIndex(), if photo-index is really shown */ if(document.getElementById("index") != undefined || startup == 1) { showPhotoIndex(); startup = 0; } -} +} // refreshPhotoIndex() + +/** + * blur cursor focus + * + * this function removes the focus-rectangle which may appear + * when click on a link. Not always beautiful. + */ function click(object) { if(object.blur) object.blur(); -} - -// set the radio button with the given value as being checked -// do nothing if there are no radio buttons -// if the given value does not exist, all the radio buttons -// are reset to unchecked +} // click() + +/** + * change current radio-button setting + * + * This function will check the radio-button with the given value. + * If no radio-button is currently displayed, this function will do + * nothing. + * If the given value does not exist, the existing radio buttons will + * be reseted. + */ function setCheckedValue(condition, value) { var count = condition.length; @@ -146,8 +249,15 @@ function setCheckedValue(condition, value) { condition[i].checked = true; } } -} +} // setCheckedValue() + +/** + * Invoke a search + * + * This function will be invoked by starting + * any kind of search (tag-name, photo-name, date, ...). + */ function startSearch() { from_year = document.getElementById('fromyear').value; @@ -185,6 +295,12 @@ function startSearch() } // startSearch() +/** + * enable/disable date search + * + * this function will either enable or disable the + * input fields for the date-search + */ function datesearch() { var mode = true; @@ -200,15 +316,25 @@ function datesearch() document.getElementById('tomonth').disabled = mode; document.getElementById('today').disabled = mode; -} - +} // datesearch() + +/** + * set view mode + * + * called for photo-index export. will return the + * selected mode via AJAX from the server. + */ function setViewMode(mode) { var exprt = document.getElementById('output'); exprt.innerHTML = "Loading..."; exprt.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=get_export&mode=' + mode)); -} +} // setViewMode() + +/** + * reset all search-fields + */ function clearSearch() { document.getElementsByName('searchfor_tag')[0].value = ''; @@ -218,13 +344,26 @@ function clearSearch() document.getElementsByName('consider_date')[0].checked = false; datesearch(); } -} +} // clearSearch() + +/** + * if the client is planless, ask the server what to do + * next. + */ function AskServerWhatToDo() { return HTML_AJAX.grab(encodeURI('rpc.php?action=what_to_do')); -} - +} // AskServerWhatToDo() + +/** + * init phpfspot + * + * this function will be called when the browser opens phpfspot + * the first time. It will fetch the tag-lists and will then + * switch to the right view, which the browser got told from + * the server (maybe someone hit the refresh button...). + */ function init_phpfspot(mode) { /* always load list of available tags */ @@ -246,8 +385,12 @@ function init_phpfspot(mode) refreshSelectedTags(); } } + } // init_phpfspot() +/** + * change background-color on mouse-over + */ function setBackGrdColor(item, color) { if(color == 'mouseover') @@ -256,11 +399,19 @@ function setBackGrdColor(item, color) item.style.backgroundColor='#eeeeee'; if(color == 'mouseclick') item.style.backgroundColor='#93A8CA'; -} +} // setBackGrdColor() + +/** + * ask server, which photo needs to be shown + * + * when user press the refresh-button in a single-photo + * view or maybe enters the link via an external URL, the + * client does not know, what photo will be shown (dimensions...). + * But the server can tell this the browser. + */ function getPhotoToShow() { - // update selected tags var photo_to_show = HTML_AJAX.grab(encodeURI('rpc.php?action=get_photo_to_show')); // if no image needs to be shown, return false from here @@ -268,8 +419,15 @@ function getPhotoToShow() return false; return photo_to_show; -} +} // getPhotoToShow() + +/** + * a fake-zoom for photo + * + * a quick to let the browser do some zooming on + * photos. + */ function zoom(mod) { var photo; @@ -318,6 +476,12 @@ function zoom(mod) } // zoom() +/** + * hides the photo details layin + * + * if the photo is getting zoomed quiet large, this will + * auto-hide (and also restore) the photo-details-box. + */ function hidePhotoDetails(mode) { var photo_details; @@ -334,6 +498,9 @@ function hidePhotoDetails(mode) } } // hidePhotoDetails() +/** + * show calendar + */ function showCalendar(date_box, click_obj) { var calendar = document.getElementById('calendar'); @@ -361,8 +528,12 @@ function showCalendar(date_box, click_obj) else { hideCalendar(); } -} +} // showCalendar() + +/** + * hide calendar + */ function hideCalendar() { var calendar = document.getElementById('calendar'); @@ -370,8 +541,11 @@ function hideCalendar() calendar.style.visibility = 'hidden'; calendar_shown = 0; } -} +} // hideCalendar() +/** + * switch month in calendar + */ function setMonth(year, month, day) { var calendar = document.getElementById('calendar'); @@ -379,14 +553,22 @@ function setMonth(year, month, day) calendar.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=get_calendar_matrix&year='+ year +'&month='+ month +'&day='+ day)); } +/** + * get the user-selected date from the calendar and + * put it into the date-search boxes + */ function setCalendarDate(year, month, day) { document.getElementById(calendar_mode+'year').value = year; document.getElementById(calendar_mode+'month').value = month; document.getElementById(calendar_mode+'day').value = day; hideCalendar(); -} +} // setCalendarDate() + +/** + * reset phpfspot complelely and move to the begining + */ function resetAll() { HTML_AJAX.grab(encodeURI('rpc.php?action=reset')); @@ -394,8 +576,12 @@ function resetAll() refreshAvailableTags(); refreshSelectedTags(); refreshPhotoIndex(); -} +} // resetAll() + +/** + * find objects with their class-name + */ function WSR_getElementsByClassName(oElm, strTagName, oClassNames){ var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName); var arrReturnElements = new Array(); @@ -424,9 +610,12 @@ function WSR_getElementsByClassName(oElm, strTagName, oClassNames){ } } return (arrReturnElements) -} +} // WSR_getElementsByClassName() +/** + * javascript based photo preloading + */ function preloadPhotos(image_url) { var i; @@ -448,11 +637,15 @@ function preloadPhotos(image_url) { } } } -} + +} // preloadPhotos() /* a function that does nothing */ function noop() {} +/** + * start slideshow + */ function startSlideShow() { if(!sliding) { @@ -466,20 +659,32 @@ function startSlideShow() sliding = 0; document.getElementById('stop_ico').src = "resources/32_play.png"; } -} +} // startSlideShow() + +/** + * switch to next slide + */ function nextSlide() { var next_img = HTML_AJAX.grab(encodeURI('rpc.php?action=get_next_slideshow_img')); document.getElementById('slide_img').src = next_img; -} +} // nextSlide() + +/** + * switch to previous slide + */ function prevSlide() { var prev_img = HTML_AJAX.grab(encodeURI('rpc.php?action=get_prev_slideshow_img')); document.getElementById('slide_img').src = prev_img; -} +} // prevSlide() + +/** + * interrupt slide show + */ function pauseSlideShow() { if(!sliding_paused) { @@ -492,8 +697,12 @@ function pauseSlideShow() sliding = setInterval("nextSlide()", sliding_time*1000); document.getElementById('pause_ico').src = "resources/32_pause.png"; } -} +} // pauseSlideShow() + +/** + * start auto-browse + */ function startAutoBrowse() { if(!autobrowse) { @@ -508,6 +717,9 @@ function startAutoBrowse() } // startAutoBrowser() +/** + * auto-browsing + */ function autoBrowse() { if(document.getElementById('next_link')) { @@ -524,6 +736,9 @@ function autoBrowse() } // autoBrowse() +/** + * initiate slider to modify slide-switching-speed + */ function initSlider() { var sliderEl = document.getElementById ? document.getElementById("slider-1") : null; @@ -545,8 +760,12 @@ function initSlider() s.recalculate(); }; -} +} // initSlider() +/** + * if the sort-order (photo-name, date, ...) has been + * changed, update the photo-index view. + */ function update_sort_order(obj) { var objTemp = new Object(); @@ -563,7 +782,9 @@ function update_sort_order(obj) } // update_sort_order() - +/** + * handle key events + */ function keyDown(e) { var evt = (e) ? e:(window.event) ? window.event:null; @@ -604,13 +825,18 @@ if(document.layers) { document.captureEvents(Event.KEYDOWN); } +// will be reseted by first viewing photo-index var startup = 1; +// calendar specific var calendar_shown = 0; var calendar_mode = ''; +// auto-browsing & sliding var autobrowse = 0; var sliding = 0; var sliding_paused = 0; var sliding_time = 3; +// zooming var origHeight; var origWidth; +// position of the last shown photo in photo-index var photo_details_pos; -- cgit v1.2.3-18-g5258 From 7617d4479b5891e905956afa3e62d26df1271bf4 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 10:08:40 +0200 Subject: update GPL header and remove authors email address from it Signed-off-by: Andreas Unterkircher --- find_dups.php | 5 +++-- gen_thumbs.php | 5 +++-- index.php | 5 +++-- phpfspot.class.php | 5 +++-- phpfspot.js | 5 +++-- phpfspot_cfg.php.dist | 5 +++-- phpfspot_db.php | 5 +++-- phpfspot_img.php | 5 +++-- phpfspot_tmpl.php | 5 +++-- rpc.php | 5 +++-- 10 files changed, 30 insertions(+), 20 deletions(-) diff --git a/find_dups.php b/find_dups.php index 32b95f4..5d5c264 100755 --- a/find_dups.php +++ b/find_dups.php @@ -3,8 +3,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/gen_thumbs.php b/gen_thumbs.php index 05b7d0c..3951fa8 100755 --- a/gen_thumbs.php +++ b/gen_thumbs.php @@ -3,8 +3,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/index.php b/index.php index 98a2fbc..3cdf3bb 100644 --- a/index.php +++ b/index.php @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/phpfspot.class.php b/phpfspot.class.php index b375ffd..d192d0d 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/phpfspot.js b/phpfspot.js index b5f6e98..6c0054d 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -1,7 +1,8 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/phpfspot_cfg.php.dist b/phpfspot_cfg.php.dist index 75b54ad..3e3a802 100644 --- a/phpfspot_cfg.php.dist +++ b/phpfspot_cfg.php.dist @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/phpfspot_db.php b/phpfspot_db.php index 807cf0f..e5f1f0b 100644 --- a/phpfspot_db.php +++ b/phpfspot_db.php @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/phpfspot_img.php b/phpfspot_img.php index 8251b8e..43107ac 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index 3fdf2ac..6794233 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -2,8 +2,9 @@ /*************************************************************************** * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/rpc.php b/rpc.php index 786bc7d..e4fecf8 100644 --- a/rpc.php +++ b/rpc.php @@ -2,8 +2,9 @@ /* ************************************************************************* * - * Copyright (c) by Andreas Unterkircher, unki@netshadow.at - * All rights reserved + * phpfspot, presents your F-Spot photo collection in Web browsers. + * + * Copyright (c) by Andreas Unterkircher * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit v1.2.3-18-g5258 From 9b5884120e78b7e2ce35d37bdb72da7ec721452d Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:19:50 +0200 Subject: register PHPFSPOT as global variable instead hand-over via classes Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 10 +++++++++- phpfspot_tmpl.php | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index d192d0d..b1093fc 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -46,6 +46,14 @@ class PHPFSPOT { */ public function __construct() { + /** + * register PHPFSPOT class global + * + * @global PHPFSPOT $GLOBALS['phpfspot'] + * @name $phpfspot + */ + $GLOBALS['phpfspot'] =& $this; + $this->cfg = new PHPFSPOT_CFG; /* verify config settings */ @@ -132,7 +140,7 @@ class PHPFSPOT { /* overload Smarty class with our own template handler */ require_once "phpfspot_tmpl.php"; - $this->tmpl = new PHPFSPOT_TMPL($this); + $this->tmpl = new PHPFSPOT_TMPL(); /* check if all necessary indices exist */ $this->checkDbIndices(); diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index 6794233..e8bb48a 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -24,24 +24,24 @@ class PHPFSPOT_TMPL extends Smarty { - var $parent; - - public function __construct($parent) + public function __construct() { - if(!file_exists($parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates')) { - print "No templates found in ". $parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates'; + global $phpfspot; + + if(!file_exists($phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates')) { + print "No templates found in ". $phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates'; exit(1); } $this->Smarty(); - $this->template_dir = $parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates'; - $this->compile_dir = $parent->cfg->base_path .'/templates_c'; - $this->config_dir = $parent->cfg->base_path .'/smarty_config'; - $this->cache_dir = $parent->cfg->base_path .'/smarty_cache'; + $this->template_dir = $phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates'; + $this->compile_dir = $phpfspot->cfg->base_path .'/templates_c'; + $this->config_dir = $phpfspot->cfg->base_path .'/smarty_config'; + $this->cache_dir = $phpfspot->cfg->base_path .'/smarty_cache'; - if(isset($parent->cfg->use_lightbox) && $parent->cfg->use_lightbox == true) + if(isset($phpfspot->cfg->use_lightbox) && $phpfspot->cfg->use_lightbox == true) $this->assign('use_lightbox', 'true'); - if(isset($parent->cfg->use_autocomplete) && $parent->cfg->use_autocomplete == true) + if(isset($phpfspot->cfg->use_autocomplete) && $phpfspot->cfg->use_autocomplete == true) $this->assign('use_autocomplete', 'true'); } // __construct() -- cgit v1.2.3-18-g5258 From 36ef21a5707926b0a65ca2537c4aa662f33d757c Mon Sep 17 00:00:00 2001 From: Fabian Linzberger Date: Mon, 7 Apr 2008 11:05:29 +0200 Subject: fix spelling in welcome.tpl Signed-off-by: Fabian Linzberger --- themes/default/templates/welcome.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl index fe079a0..4629fda 100644 --- a/themes/default/templates/welcome.tpl +++ b/themes/default/templates/welcome.tpl @@ -19,7 +19,7 @@
- You can addept this welcome page in the file "welcome.tpl" in the template
+ You can adapt this welcome page in the file "welcome.tpl" in the template
directory of your current theme.
-- cgit v1.2.3-18-g5258 From ae99d62da68f045e253c21f4db1ccee8d68b29ca Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:19:50 +0200 Subject: register PHPFSPOT as global variable instead hand-over via classes Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 10 +++++++++- phpfspot_tmpl.php | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index d192d0d..b1093fc 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -46,6 +46,14 @@ class PHPFSPOT { */ public function __construct() { + /** + * register PHPFSPOT class global + * + * @global PHPFSPOT $GLOBALS['phpfspot'] + * @name $phpfspot + */ + $GLOBALS['phpfspot'] =& $this; + $this->cfg = new PHPFSPOT_CFG; /* verify config settings */ @@ -132,7 +140,7 @@ class PHPFSPOT { /* overload Smarty class with our own template handler */ require_once "phpfspot_tmpl.php"; - $this->tmpl = new PHPFSPOT_TMPL($this); + $this->tmpl = new PHPFSPOT_TMPL(); /* check if all necessary indices exist */ $this->checkDbIndices(); diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index 6794233..e8bb48a 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -24,24 +24,24 @@ class PHPFSPOT_TMPL extends Smarty { - var $parent; - - public function __construct($parent) + public function __construct() { - if(!file_exists($parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates')) { - print "No templates found in ". $parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates'; + global $phpfspot; + + if(!file_exists($phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates')) { + print "No templates found in ". $phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates'; exit(1); } $this->Smarty(); - $this->template_dir = $parent->cfg->base_path .'/themes/'. $parent->cfg->theme_name .'/templates'; - $this->compile_dir = $parent->cfg->base_path .'/templates_c'; - $this->config_dir = $parent->cfg->base_path .'/smarty_config'; - $this->cache_dir = $parent->cfg->base_path .'/smarty_cache'; + $this->template_dir = $phpfspot->cfg->base_path .'/themes/'. $phpfspot->cfg->theme_name .'/templates'; + $this->compile_dir = $phpfspot->cfg->base_path .'/templates_c'; + $this->config_dir = $phpfspot->cfg->base_path .'/smarty_config'; + $this->cache_dir = $phpfspot->cfg->base_path .'/smarty_cache'; - if(isset($parent->cfg->use_lightbox) && $parent->cfg->use_lightbox == true) + if(isset($phpfspot->cfg->use_lightbox) && $phpfspot->cfg->use_lightbox == true) $this->assign('use_lightbox', 'true'); - if(isset($parent->cfg->use_autocomplete) && $parent->cfg->use_autocomplete == true) + if(isset($phpfspot->cfg->use_autocomplete) && $phpfspot->cfg->use_autocomplete == true) $this->assign('use_autocomplete', 'true'); } // __construct() -- cgit v1.2.3-18-g5258 From de554684586d2b8c413ccc7cd75fb31168fb5d2f Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:22:38 +0200 Subject: add gen_docs.sh Signed-off-by: Andreas Unterkircher --- gen_docs.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 gen_docs.sh diff --git a/gen_docs.sh b/gen_docs.sh new file mode 100755 index 0000000..1e58969 --- /dev/null +++ b/gen_docs.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# create phpDocumentor docs from phpfspot source code + +phpdoc -o HTML:frames:earthli \ + -d . \ + -t docs \ + -i 'thumbs/,resources/,templates_c/' \ + -ti 'phpfspot source-code documentation' \ + -dn 'phpfspot' \ + -s \ + -q -- cgit v1.2.3-18-g5258 From 2765fc086522b5fb9f209bdfe266e577fc65ca84 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:23:12 +0200 Subject: added phpDocumentor tags to parts of the code Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 210 ++++++++++++++++++++++++++++++++++++++++++++++------- phpfspot_db.php | 4 + phpfspot_img.php | 8 ++ 3 files changed, 194 insertions(+), 28 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index b1093fc..12e14fa 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -25,20 +25,76 @@ require_once "phpfspot_cfg.php"; require_once "phpfspot_db.php"; +/** + * PHPFSPOT main class + * + * @package phpfspot + */ class PHPFSPOT { + /** + * phpfspot configuration + * @access public + * @see PHPFSPOT_CFG() + * @var PHPFSPOT_CFG + */ var $cfg; + + /** + * SQLite database handle to f-spot database + * @see PHPFSPOT_DB() + * @access public + * @var PHPFSPOT_DB + */ var $db; + + /** + * SQLite database handle to phpfspot database + * @see PHPFSPOT_DB() + * @access public + * @var PHPFSPOT_DB + */ var $cfg_db; + + /** + * Smarty template engine + * @link http://smarty.php.net smarty.php.net + * @see PHPFSPOT_TMPL() + * @access public + * @var PHPFSPOT_TMPL + */ var $tmpl; + + /** + * full tag - list + * @access public + * @var array + */ var $tags; + + /** + * list of available, not-selected, tags + * @access public + * @var array + */ var $avail_tags; + /** + * true if runtime error occued + * @access private + * @var boolean + */ private $runtime_error = false; + + /** + * F-Spot database version + * @access private + * @var integer + */ private $dbver; /** - * class constructor + * class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver) * * this function will be called on class construct * and will check requirements, loads configuration, @@ -330,6 +386,8 @@ class PHPFSPOT { * * retrieve all available details from f-spot's * database and return them as object + * @param integer $idx + * @return object|null */ public function get_photo_details($idx) { @@ -386,6 +444,9 @@ class PHPFSPOT { * this function returns aligned (length) names for * an specific photo. If the length of the name exceeds * $limit the name will be shrinked (...) + * @param integer $idx + * @param integer $limit + * @return string|null */ public function getPhotoName($idx, $limit = 0) { @@ -406,6 +467,9 @@ class PHPFSPOT { * If the length of the name exceeds $limit the * text will be shortend and some content in between * will be replaced with "..." + * @param string $ext + * @param integer $limit + * @return string */ private function shrink_text($text, $limit) { @@ -423,6 +487,9 @@ class PHPFSPOT { * as the full-qualified path recorded in the f-spot database * is usally not the same as on the webserver, this function * will replace the path with that one specified in the cfg + * @param string $path + * @param integer $width + * @return string */ public function translate_path($path, $width = 0) { @@ -435,6 +502,7 @@ class PHPFSPOT { * * this function provides all the necessary information * for the single photo template. + * @param integer photo */ public function showPhoto($photo) { @@ -654,6 +722,7 @@ class PHPFSPOT { * this function output all tags which have been selected * by the user. the selected tags are stored in the * session-variable $_SESSION['selected_tags'] + * @return string */ public function getSelectedTags() { @@ -686,6 +755,7 @@ class PHPFSPOT { * this function will add the specified to users current * tag selection. if a date search has been made before * it will be now cleared + * @return string */ public function addTag($tag) { @@ -708,6 +778,8 @@ class PHPFSPOT { * * this function removes the specified tag from * users current tag selection + * @param string $tag + * @return string */ public function delTag($tag) { @@ -739,6 +811,7 @@ class PHPFSPOT { /** * returns the value for the autocomplet tag-search + * @return string */ public function get_xml_tag_list() { @@ -847,6 +920,7 @@ class PHPFSPOT { * the tag-selection, tag- or date-search. * the tag-search also has to take care of AND * and OR conjunctions + * @return array */ public function getPhotoSelection() { @@ -1267,6 +1341,10 @@ class PHPFSPOT { * stored as $thumb_image. It will check if the image is * in a supported format, if necessary rotate the image * (based on EXIF orientation meta headers) and re-sizing. + * @param string $orig_image + * @param string $thumb_image + * @param integer $width + * @return boolean */ public function create_thumbnail($orig_image, $thumb_image, $width) { @@ -1419,6 +1497,8 @@ class PHPFSPOT { /** * return all exif meta data from the file + * @param string $file + * @return array */ public function get_meta_informations($file) { @@ -1457,6 +1537,9 @@ class PHPFSPOT { * readable * 2. Check if the md5sum of the original file has changed * 3. Generate the thumbnails if needed + * @param integer $idx + * @param integer $force + * @param boolean $overwrite */ public function gen_thumb($idx = 0, $force = 0, $overwrite = false) { @@ -1539,6 +1622,8 @@ class PHPFSPOT { * * this function queries the phpfspot database for a * stored MD5 checksum of the specified photo + * @param integer $idx + * @return string|null */ public function getMD5($idx) { @@ -1558,6 +1643,8 @@ class PHPFSPOT { /** * set MD5 sum for the specific photo + * @param integer $idx + * @param string $md5 */ private function setMD5($idx, $md5) { @@ -1573,6 +1660,8 @@ class PHPFSPOT { * * this function stores the current tag condition * (AND or OR) in the users session variables + * @param string $mode + * @return string */ public function setTagCondition($mode) { @@ -1590,6 +1679,7 @@ class PHPFSPOT { * it also handles the date search. * getPhotoSelection() will then only return the matching * photos. + * @return string */ public function startSearch() { @@ -1640,6 +1730,8 @@ class PHPFSPOT { * * this function is invoked by RPC and will sort the requested * sort order in the session variable. + * @param string $sort_order + * @return string */ public function updateSortOrder($order) { @@ -1657,6 +1749,9 @@ class PHPFSPOT { * * this function rotates the image according the * specified angel. + * @param string $img + * @param integer $degress + * @return image */ private function rotateImage($img, $degrees) { @@ -1734,6 +1829,9 @@ class PHPFSPOT { * * this function will return an either horizontal or * vertical flipped truecolor image. + * @param string $image + * @param string $mode + * @return image */ private function flipImage($image, $mode) { @@ -1760,6 +1858,8 @@ class PHPFSPOT { /** * return all assigned tags for the specified photo + * @param integer $idx + * @return array */ private function get_photo_tags($idx) { @@ -1782,6 +1882,11 @@ class PHPFSPOT { /** * create on-the-fly images with text within + * @param string $txt + * @param string $color + * @param integer $space + * @param integer $font + * @param integer $w */ public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300) { @@ -1811,6 +1916,7 @@ class PHPFSPOT { /** * check if all requirements are met + * @return boolean */ private function check_requirements() { @@ -1865,6 +1971,8 @@ class PHPFSPOT { /** * check if specified MIME type is supported + * @param string $mime + * @return boolean */ public function checkifImageSupported($mime) { @@ -1875,6 +1983,10 @@ class PHPFSPOT { } // checkifImageSupported() + /** + * output error text + * @param string $text + */ public function _error($text) { switch($this->cfg->logging) { @@ -1897,6 +2009,8 @@ class PHPFSPOT { /** * output calendard input fields + * @param string $mode + * @return string */ private function get_calendar($mode) { @@ -1923,6 +2037,9 @@ class PHPFSPOT { /** * output calendar matrix + * @param integer $year + * @param integer $month + * @param integer $day */ public function get_calendar_matrix($year = 0, $month = 0, $day = 0) { @@ -2001,6 +2118,7 @@ class PHPFSPOT { /** * output export page + * @param string $mode */ public function getExport($mode) { @@ -2116,6 +2234,7 @@ class PHPFSPOT { /** * return all selected tags as one string + * @return array */ private function getCurrentTags() { @@ -2147,6 +2266,7 @@ class PHPFSPOT { * to do next. This is necessary for directly jumping * into photo index or single photo view when the are * requested with specific URLs + * @return string */ public function whatToDo() { @@ -2166,6 +2286,7 @@ class PHPFSPOT { /** * return the current process-user + * @return string */ private function getuid() { @@ -2181,6 +2302,9 @@ class PHPFSPOT { /** * returns a select-dropdown box to select photo index sort parameters + * @param array $params + * @param smarty $smarty + * @return string */ public function smarty_sort_select_list($params, &$smarty) { @@ -2200,6 +2324,7 @@ class PHPFSPOT { /** * returns the currently selected sort order + * @return string */ private function get_sort_order() { @@ -2236,12 +2361,13 @@ class PHPFSPOT { } // get_sort_order() - /*** - * return the next to be shown slide show image - * - * this function returns the URL of the next image - * in the slideshow sequence. - */ + /** + * return the next to be shown slide show image + * + * this function returns the URL of the next image + * in the slideshow sequence. + * @return string + */ public function getNextSlideShowImage() { $all_photos = $this->getPhotoSelection(); @@ -2255,12 +2381,13 @@ class PHPFSPOT { } // getNextSlideShowImage() - /*** - * return the previous to be shown slide show image - * - * this function returns the URL of the previous image - * in the slideshow sequence. - */ + /** + * return the previous to be shown slide show image + * + * this function returns the URL of the previous image + * in the slideshow sequence. + * @return string + */ public function getPrevSlideShowImage() { $all_photos = $this->getPhotoSelection(); @@ -2281,16 +2408,17 @@ class PHPFSPOT { } // resetSlideShow() - /*** - * get random photo - * - * this function will get all photos from the fspot - * database and randomly return ONE entry - * - * saddly there is yet no sqlite3 function which returns - * the bulk result in array, so we have to fill up our - * own here. - */ + /** + * get random photo + * + * this function will get all photos from the fspot + * database and randomly return ONE entry + * + * saddly there is yet no sqlite3 function which returns + * the bulk result in array, so we have to fill up our + * own here. + * @return array + */ public function get_random_photo() { $all = Array(); @@ -2314,6 +2442,8 @@ class PHPFSPOT { * this function validates if the provided date * contains a valid date and will return true * if it is. + * @param string $date_str + * @return boolean */ public function isValidDate($date_str) { @@ -2328,15 +2458,22 @@ class PHPFSPOT { /** * timestamp to string conversion + * @param integer $timestamp + * @return string */ private function ts2str($timestamp) { return strftime("%Y-%m-%d", $timestamp); } // ts2str() + /** + * extract tag-names from $_GET['tags'] + * @param string $tags_str + * @return string + */ private function extractTags($tags_str) { - $not_validated = split(',', $_GET['tags']); + $not_validated = split(',', $tags_str); $validated = array(); foreach($not_validated as $tag) { @@ -2350,6 +2487,9 @@ class PHPFSPOT { /** * returns the full path to a thumbnail + * @param integer $width + * @param integer $photo + * @return string */ public function get_thumb_path($width, $photo) { @@ -2367,6 +2507,7 @@ class PHPFSPOT { /** * returns server's virtual host name + * @return string */ private function get_server_name() { @@ -2374,8 +2515,8 @@ class PHPFSPOT { } // get_server_name() /** - * returns type of webprotocol which is - * currently used + * returns type of webprotocol which is currently used + * @return string */ private function get_web_protocol() { @@ -2387,6 +2528,7 @@ class PHPFSPOT { /** * return url to this phpfspot installation + * @return string */ private function get_phpfspot_url() { @@ -2395,6 +2537,8 @@ class PHPFSPOT { /** * returns the number of photos which are tagged with $tag_id + * @param integer $tag_id + * @return integer */ public function get_num_photos($tag_id) { @@ -2418,6 +2562,9 @@ class PHPFSPOT { * returns true, if everything is ok, otherwise false * if $silent is not set, this function will output and * error message + * @param string $file + * @param boolean $silent + * @retrun boolean */ private function check_readable($file, $silent = null) { @@ -2462,6 +2609,7 @@ class PHPFSPOT { * * this function will return the F-Spot database version number * It is stored within the sqlite3 database in the table meta + * @return string|null */ public function getFspotDBVersion() { @@ -2478,8 +2626,10 @@ class PHPFSPOT { } // getFspotDBVersion() /** - * parse the provided URI and will returned the - * requested chunk + * parse the provided URI and will returned the requested chunk + * @param string $uri + * @param string $mode + * @return string */ public function parse_uri($uri, $mode) { @@ -2507,6 +2657,7 @@ class PHPFSPOT { * * this function checks if all necessary configuration options are * specified and set. + * @return boolean */ private function check_config_options() { @@ -2626,6 +2777,9 @@ class PHPFSPOT { * current page, in which the $current photo lies. this is * used to display the correct photo, when calling showPhotoIndex() * from showImage() + * @param integer $current + * @param integer $max + * @return integer */ private function getCurrentPage($current, $max) { diff --git a/phpfspot_db.php b/phpfspot_db.php index e5f1f0b..83376ad 100644 --- a/phpfspot_db.php +++ b/phpfspot_db.php @@ -22,6 +22,10 @@ * ***************************************************************************/ +/** + * PHPFSPOT_DB class + * @package phpfspot + */ class PHPFSPOT_DB { private $db; diff --git a/phpfspot_img.php b/phpfspot_img.php index 43107ac..8379b83 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -24,6 +24,14 @@ require_once "phpfspot.class.php"; +/** + * PHPFSPOT_IMG class + * + * handles phpfspot's photos. It will output either the photo binaries + * or can also show error messages as a on-the-fly generated picture. + * + * @package phpfspot + */ class PHPFSPOT_IMG { var $db; -- cgit v1.2.3-18-g5258 From 7688cbcdf666c2c538bc35cbc4efbe929a8fa9da Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:57:55 +0200 Subject: further pimped code for phpDocumentor Signed-off-by: Andreas Unterkircher --- phpfspot_db.php | 4 +++- phpfspot_img.php | 8 +++++--- phpfspot_tmpl.php | 17 ++++++++++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/phpfspot_db.php b/phpfspot_db.php index 83376ad..90fdb8c 100644 --- a/phpfspot_db.php +++ b/phpfspot_db.php @@ -42,7 +42,9 @@ class PHPFSPOT_DB { */ public function __construct($parent, $db_path) { - $this->parent = $parent; + global $phpfspot; + + $this->parent = $phpfspot; $this->db_path = $db_path; /* We are starting disconnected */ diff --git a/phpfspot_img.php b/phpfspot_img.php index 8379b83..f298b00 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -34,8 +34,8 @@ require_once "phpfspot.class.php"; */ class PHPFSPOT_IMG { - var $db; - var $parent; + private $db; + private $parent; /** * PHPFSPOT_IMG class constructor @@ -62,6 +62,8 @@ class PHPFSPOT_IMG { * the client - in the specified width. it also try's * to create on-the-fly missing thumbnails via PHPFSPOT * gen_thumbs function. + * @param integer $idx + * @param integer $width */ public function show($idx, $width = 0) { @@ -126,7 +128,7 @@ class PHPFSPOT_IMG { } // show() -} +} // PHPFSPOT_IMG() if(isset($_GET['idx']) && (is_numeric($_GET['idx']) || $_GET['idx'] == 'rand')) { diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php index e8bb48a..f6d3ce8 100644 --- a/phpfspot_tmpl.php +++ b/phpfspot_tmpl.php @@ -22,8 +22,17 @@ * ***************************************************************************/ +/** + * PHPFSPOT_TMPL class + * + * Extends Smarty base class with some additional functions + * @package phpfspot + */ class PHPFSPOT_TMPL extends Smarty { + /** + * class constructor + */ public function __construct() { global $phpfspot; @@ -46,12 +55,18 @@ class PHPFSPOT_TMPL extends Smarty { } // __construct() + /** + * show template + * + * outputs the requested template + * @param string $template + */ public function show($template) { $this->display($template); } // show() -} +} // PHPFSPOT_TMPL() ?> -- cgit v1.2.3-18-g5258 From 14eb0419012155b6d36f25dd9bd1d2ba683dbed7 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:28:49 +0200 Subject: translate_path() only needs one parameters. remove unused second one Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 9 ++++----- phpfspot_img.php | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 12e14fa..b8f45a8 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -488,10 +488,9 @@ class PHPFSPOT { * is usally not the same as on the webserver, this function * will replace the path with that one specified in the cfg * @param string $path - * @param integer $width * @return string */ - public function translate_path($path, $width = 0) + public function translate_path($path) { return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path); @@ -541,7 +540,7 @@ class PHPFSPOT { return; } - $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); + $orig_path = $this->translate_path($this->parse_uri($details['uri'])); $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo); if(!file_exists($orig_path)) { @@ -1555,7 +1554,7 @@ class PHPFSPOT { $details = $this->get_photo_details($idx); /* calculate file MD5 sum */ - $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); + $full_path = $this->translate_path($this->parse_uri($details['uri'])); if(!file_exists($full_path)) { $this->_error("File ". $full_path ." does not exist\n"); @@ -2200,7 +2199,7 @@ class PHPFSPOT {
". $details['description']); - $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath')); + $orig_path = $this->translate_path($this->parse_uri($details['uri'])); /* get EXIF information if JPEG */ if($details['mime'] == "image/jpeg") { diff --git a/phpfspot_img.php b/phpfspot_img.php index f298b00..461f5c6 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -79,7 +79,7 @@ class PHPFSPOT_IMG { /* no width specified - show photo in its original size */ if($width == 0) { - $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath')); + $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'])); } /* show thumbnail */ else { -- cgit v1.2.3-18-g5258 From 7703bb616f1966c47a230f5027b4f718769857d6 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 12:59:37 +0200 Subject: translate_path() only needs one parameters. remove unused second one Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 12e14fa..ccfbd25 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -488,10 +488,9 @@ class PHPFSPOT { * is usally not the same as on the webserver, this function * will replace the path with that one specified in the cfg * @param string $path - * @param integer $width * @return string */ - public function translate_path($path, $width = 0) + public function translate_path($path) { return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path); -- cgit v1.2.3-18-g5258 From cc5fc15f323d7ec65ca5ece977a50f2fe6153f8e Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 18:20:55 +0200 Subject: code cleanups in rpc.php Signed-off-by: Andreas Unterkircher --- rpc.php | 58 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/rpc.php b/rpc.php index e4fecf8..bdb6206 100644 --- a/rpc.php +++ b/rpc.php @@ -24,10 +24,20 @@ require_once "phpfspot.class.php"; +/** + * PHPFSPOT_RPC class + * + * handles AJAX-RPC calls from client browsers + * @package phpfspot + */ class PHPFSPOT_RPC { + /** + * PHPFSPOT_RPC constructor + */ public function __construct() { + /* start PHP session */ session_start(); } // __construct() @@ -39,7 +49,7 @@ class PHPFSPOT_RPC { $server = new HTML_AJAX_Server(); $server->handleRequest(); - $fspot = new PHPFSPOT(); + $phpfspot = new PHPFSPOT(); /* if no action is specified, no need to further process this * function here. @@ -55,45 +65,45 @@ class PHPFSPOT_RPC { switch($action) { case 'showphoto': if(isset($_GET['id']) && is_numeric($_GET['id'])) { - $fspot->showPhoto($_GET['id']); + $phpfspot->showPhoto($_GET['id']); } break; case 'getxmltaglist': - print $fspot->get_xml_tag_list(); + print $phpfspot->get_xml_tag_list(); break; case 'show_available_tags': - print $fspot->getAvailableTags(); + print $phpfspot->getAvailableTags(); break; case 'show_selected_tags': - print $fspot->getSelectedTags(); + print $phpfspot->getSelectedTags(); break; case 'addtag': if(isset($_POST['id']) && is_numeric($_POST['id'])) { - print $fspot->addTag($_POST['id']); + print $phpfspot->addTag($_POST['id']); } break; case 'deltag': if(isset($_POST['id']) && is_numeric($_POST['id'])) { - print $fspot->delTag($_POST['id']); + print $phpfspot->delTag($_POST['id']); } break; case 'reset': - $fspot->resetTagSearch(); - $fspot->resetNameSearch(); - $fspot->resetTags(); - $fspot->resetDateSearch(); - $fspot->resetPhotoView(); + $phpfspot->resetTagSearch(); + $phpfspot->resetNameSearch(); + $phpfspot->resetTags(); + $phpfspot->resetDateSearch(); + $phpfspot->resetPhotoView(); break; case 'tagcondition': if(isset($_POST['mode']) && in_array($_POST['mode'], Array('or', 'and'))) { - print $fspot->setTagCondition($_POST['mode']); + print $phpfspot->setTagCondition($_POST['mode']); } break; @@ -107,54 +117,54 @@ class PHPFSPOT_RPC { if(isset($_GET['last_photo']) && is_numeric($_GET['last_photo'])) $_SESSION['last_photo'] = $_GET['last_photo']; - $fspot->showPhotoIndex(); + $phpfspot->showPhotoIndex(); break; case 'showcredits': - $fspot->showCredits(); + $phpfspot->showCredits(); break; case 'search': - print $fspot->startSearch(); + print $phpfspot->startSearch(); break; case 'update_sort_order': if(isset($_POST['value']) && is_string($_POST['value'])) { - print $fspot->updateSortOrder($_POST['value']); + print $phpfspot->updateSortOrder($_POST['value']); } break; case 'get_export': /* $_GET['mode'] will be validated by getExport() */ - $fspot->getExport($_GET['mode']); + $phpfspot->getExport($_GET['mode']); break; case 'get_photo_to_show': - $fspot->getCurrentPhoto(); + $phpfspot->getCurrentPhoto(); break; case 'get_calendar_matrix': if((is_numeric($_GET['year']) || !isset($_GET['year'])) && (is_numeric($_GET['month']) || !isset($_GET['month'])) && (is_numeric($_GET['day']) || !isset($_GET['day']))) { - $fspot->get_calendar_matrix($_GET['year'], $_GET['month'], $_GET['day']); + $phpfspot->get_calendar_matrix($_GET['year'], $_GET['month'], $_GET['day']); } break; case 'what_to_do': - print $fspot->whatToDo(); + print $phpfspot->whatToDo(); break; case 'reset_slideshow': - print $fspot->resetSlideShow(); + print $phpfspot->resetSlideShow(); break; case 'get_next_slideshow_img': - print $fspot->getNextSlideShowImage(); + print $phpfspot->getNextSlideShowImage(); break; case 'get_prev_slideshow_img': - print $fspot->getPrevSlideShowImage(); + print $phpfspot->getPrevSlideShowImage(); break; } -- cgit v1.2.3-18-g5258 From 478bae1a1072f2de18f46bf3fc3f0ce2643f4571 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 12 Apr 2008 18:25:30 +0200 Subject: commit current phpDocumentor docs --- docs/blank.html | 13 + docs/classtrees_phpfspot.html | 44 + docs/elementindex.html | 1015 ++++++++++++ docs/elementindex_phpfspot.html | 1012 ++++++++++++ docs/errors.html | 66 + docs/index.html | 24 + docs/li_phpfspot.html | 47 + docs/media/banner.css | 33 + docs/media/images/AbstractClass.png | Bin 0 -> 620 bytes docs/media/images/AbstractClass_logo.png | Bin 0 -> 1232 bytes docs/media/images/AbstractMethod.png | Bin 0 -> 696 bytes docs/media/images/AbstractPrivateClass.png | Bin 0 -> 848 bytes docs/media/images/AbstractPrivateClass_logo.png | Bin 0 -> 1615 bytes docs/media/images/AbstractPrivateMethod.png | Bin 0 -> 874 bytes docs/media/images/Class.png | Bin 0 -> 570 bytes docs/media/images/Class_logo.png | Bin 0 -> 1600 bytes docs/media/images/Constant.png | Bin 0 -> 752 bytes docs/media/images/Constructor.png | Bin 0 -> 865 bytes docs/media/images/Destructor.png | Bin 0 -> 956 bytes docs/media/images/Function.png | Bin 0 -> 596 bytes docs/media/images/Global.png | Bin 0 -> 712 bytes docs/media/images/I.png | Bin 0 -> 148 bytes docs/media/images/Index.png | Bin 0 -> 584 bytes docs/media/images/Interface.png | Bin 0 -> 1083 bytes docs/media/images/Interface_logo.png | Bin 0 -> 1600 bytes docs/media/images/L.png | Bin 0 -> 153 bytes docs/media/images/Lminus.png | Bin 0 -> 219 bytes docs/media/images/Lplus.png | Bin 0 -> 224 bytes docs/media/images/Method.png | Bin 0 -> 661 bytes docs/media/images/Page.png | Bin 0 -> 592 bytes docs/media/images/Page_logo.png | Bin 0 -> 1369 bytes docs/media/images/PrivateClass.png | Bin 0 -> 790 bytes docs/media/images/PrivateClass_logo.png | Bin 0 -> 1836 bytes docs/media/images/PrivateMethod.png | Bin 0 -> 918 bytes docs/media/images/PrivateVariable.png | Bin 0 -> 772 bytes docs/media/images/StaticMethod.png | Bin 0 -> 661 bytes docs/media/images/StaticVariable.png | Bin 0 -> 688 bytes docs/media/images/T.png | Bin 0 -> 152 bytes docs/media/images/Tminus.png | Bin 0 -> 207 bytes docs/media/images/Tplus.png | Bin 0 -> 222 bytes docs/media/images/Variable.png | Bin 0 -> 688 bytes docs/media/images/blank.png | Bin 0 -> 144 bytes docs/media/images/class_folder.png | Bin 0 -> 633 bytes docs/media/images/empty.png | Bin 0 -> 90 bytes docs/media/images/file.png | Bin 0 -> 462 bytes docs/media/images/folder.png | Bin 0 -> 492 bytes docs/media/images/function_folder.png | Bin 0 -> 605 bytes docs/media/images/next_button.png | Bin 0 -> 657 bytes docs/media/images/next_button_disabled.png | Bin 0 -> 543 bytes docs/media/images/package.png | Bin 0 -> 668 bytes docs/media/images/package_folder.png | Bin 0 -> 564 bytes docs/media/images/previous_button.png | Bin 0 -> 644 bytes docs/media/images/previous_button_disabled.png | Bin 0 -> 541 bytes docs/media/images/private_class_logo.png | Bin 0 -> 1836 bytes docs/media/images/tutorial.png | Bin 0 -> 431 bytes docs/media/images/tutorial_folder.png | Bin 0 -> 572 bytes docs/media/images/up_button.png | Bin 0 -> 668 bytes docs/media/stylesheet.css | 146 ++ docs/packages.html | 36 + docs/phpfspot/PHPFSPOT.html | 1929 +++++++++++++++++++++++ docs/phpfspot/PHPFSPOT_CFG.html | 668 ++++++++ docs/phpfspot/PHPFSPOT_DB.html | 367 +++++ docs/phpfspot/PHPFSPOT_IMG.html | 177 +++ docs/phpfspot/PHPFSPOT_RPC.html | 136 ++ docs/phpfspot/PHPFSPOT_TMPL.html | 145 ++ docs/phpfspot/_find_dups.php.html | 63 + docs/phpfspot/_gen_thumbs.php.html | 63 + docs/phpfspot/_index.php.html | 63 + docs/phpfspot/_phpfspot.class.php.html | 108 ++ docs/phpfspot/_phpfspot_cfg.php.html | 63 + docs/phpfspot/_phpfspot_db.php.html | 65 + docs/phpfspot/_phpfspot_img.php.html | 93 ++ docs/phpfspot/_phpfspot_tmpl.php.html | 65 + docs/phpfspot/_rpc.php.html | 91 ++ docs/ric_CHANGELOG.html | 80 + docs/ric_INSTALL.html | 62 + docs/ric_README.html | 24 + 77 files changed, 6698 insertions(+) create mode 100644 docs/blank.html create mode 100644 docs/classtrees_phpfspot.html create mode 100644 docs/elementindex.html create mode 100644 docs/elementindex_phpfspot.html create mode 100644 docs/errors.html create mode 100644 docs/index.html create mode 100644 docs/li_phpfspot.html create mode 100644 docs/media/banner.css create mode 100644 docs/media/images/AbstractClass.png create mode 100644 docs/media/images/AbstractClass_logo.png create mode 100644 docs/media/images/AbstractMethod.png create mode 100644 docs/media/images/AbstractPrivateClass.png create mode 100644 docs/media/images/AbstractPrivateClass_logo.png create mode 100644 docs/media/images/AbstractPrivateMethod.png create mode 100644 docs/media/images/Class.png create mode 100644 docs/media/images/Class_logo.png create mode 100644 docs/media/images/Constant.png create mode 100644 docs/media/images/Constructor.png create mode 100644 docs/media/images/Destructor.png create mode 100644 docs/media/images/Function.png create mode 100644 docs/media/images/Global.png create mode 100644 docs/media/images/I.png create mode 100644 docs/media/images/Index.png create mode 100644 docs/media/images/Interface.png create mode 100644 docs/media/images/Interface_logo.png create mode 100644 docs/media/images/L.png create mode 100644 docs/media/images/Lminus.png create mode 100644 docs/media/images/Lplus.png create mode 100644 docs/media/images/Method.png create mode 100644 docs/media/images/Page.png create mode 100644 docs/media/images/Page_logo.png create mode 100644 docs/media/images/PrivateClass.png create mode 100644 docs/media/images/PrivateClass_logo.png create mode 100644 docs/media/images/PrivateMethod.png create mode 100644 docs/media/images/PrivateVariable.png create mode 100644 docs/media/images/StaticMethod.png create mode 100644 docs/media/images/StaticVariable.png create mode 100644 docs/media/images/T.png create mode 100644 docs/media/images/Tminus.png create mode 100644 docs/media/images/Tplus.png create mode 100644 docs/media/images/Variable.png create mode 100644 docs/media/images/blank.png create mode 100644 docs/media/images/class_folder.png create mode 100644 docs/media/images/empty.png create mode 100644 docs/media/images/file.png create mode 100644 docs/media/images/folder.png create mode 100644 docs/media/images/function_folder.png create mode 100644 docs/media/images/next_button.png create mode 100644 docs/media/images/next_button_disabled.png create mode 100644 docs/media/images/package.png create mode 100644 docs/media/images/package_folder.png create mode 100644 docs/media/images/previous_button.png create mode 100644 docs/media/images/previous_button_disabled.png create mode 100644 docs/media/images/private_class_logo.png create mode 100644 docs/media/images/tutorial.png create mode 100644 docs/media/images/tutorial_folder.png create mode 100644 docs/media/images/up_button.png create mode 100644 docs/media/stylesheet.css create mode 100644 docs/packages.html create mode 100644 docs/phpfspot/PHPFSPOT.html create mode 100644 docs/phpfspot/PHPFSPOT_CFG.html create mode 100644 docs/phpfspot/PHPFSPOT_DB.html create mode 100644 docs/phpfspot/PHPFSPOT_IMG.html create mode 100644 docs/phpfspot/PHPFSPOT_RPC.html create mode 100644 docs/phpfspot/PHPFSPOT_TMPL.html create mode 100644 docs/phpfspot/_find_dups.php.html create mode 100644 docs/phpfspot/_gen_thumbs.php.html create mode 100644 docs/phpfspot/_index.php.html create mode 100644 docs/phpfspot/_phpfspot.class.php.html create mode 100644 docs/phpfspot/_phpfspot_cfg.php.html create mode 100644 docs/phpfspot/_phpfspot_db.php.html create mode 100644 docs/phpfspot/_phpfspot_img.php.html create mode 100644 docs/phpfspot/_phpfspot_tmpl.php.html create mode 100644 docs/phpfspot/_rpc.php.html create mode 100644 docs/ric_CHANGELOG.html create mode 100644 docs/ric_INSTALL.html create mode 100644 docs/ric_README.html diff --git a/docs/blank.html b/docs/blank.html new file mode 100644 index 0000000..2456a52 --- /dev/null +++ b/docs/blank.html @@ -0,0 +1,13 @@ + + + phpfspot source-code documentation + + + + +

phpfspot source-code documentation

+Welcome to phpfspot!
+
+This documentation was generated by phpDocumentor v1.4.2
+ + \ No newline at end of file diff --git a/docs/classtrees_phpfspot.html b/docs/classtrees_phpfspot.html new file mode 100644 index 0000000..6ee5ce4 --- /dev/null +++ b/docs/classtrees_phpfspot.html @@ -0,0 +1,44 @@ + + + + + + + + + + + + +

+ +

+

Root class PHPFSPOT

+ + +

Root class PHPFSPOT_CFG

+ + +

Root class PHPFSPOT_DB

+ + +

Root class PHPFSPOT_IMG

+ + +

Root class PHPFSPOT_RPC

+ + +

Root class Smarty

+ + +

+ Documentation generated on Sat, 12 Apr 2008 18:24:48 +0200 by phpDocumentor 1.4.2 +

+ + \ No newline at end of file diff --git a/docs/elementindex.html b/docs/elementindex.html new file mode 100644 index 0000000..15acbc4 --- /dev/null +++ b/docs/elementindex.html @@ -0,0 +1,1015 @@ + + + + + + + + + + + +

Full index

+

Package indexes

+ +
+
+ a + b + c + d + e + f + g + h + i + l + m + p + r + s + t + u + w + _ +
+ + +
+
a
+ +
+
+
+
+ Variable + $avail_tags +
+
+
PHPFSPOT::$avail_tags in phpfspot.class.php
+
list of available, not-selected, tags
+
+
+ Method + addTag +
+
+
PHPFSPOT::addTag() in phpfspot.class.php
+
add tag to users session variable
+
+
+ +
+
b
+ +
+
+
+
+ Variable + $base_path +
+
+
PHPFSPOT_CFG::$base_path in phpfspot_cfg.php
+
+
+ +
+
c
+ +
+
+
+
+ Variable + $cfg +
+
+
PHPFSPOT::$cfg in phpfspot.class.php
+
phpfspot configuration
+
+
+ Variable + $cfg_db +
+
+
PHPFSPOT::$cfg_db in phpfspot.class.php
+
SQLite database handle to phpfspot database
+
+
+ Method + checkifImageSupported +
+
+
PHPFSPOT::checkifImageSupported() in phpfspot.class.php
+
check if specified MIME type is supported
+
+
+ Method + check_config_table +
+
+
PHPFSPOT::check_config_table() in phpfspot.class.php
+
create phpfspot own sqlite database
+
+
+ Method + cleanup_phpfspot_db +
+
+
PHPFSPOT::cleanup_phpfspot_db() in phpfspot.class.php
+
cleanup phpfspot own database
+
+
+ Method + create_thumbnail +
+
+
PHPFSPOT::create_thumbnail() in phpfspot.class.php
+
create_thumbnails for the requested width
+
+
+ +
+
d
+ +
+
+
+
+ Variable + $db +
+
+
PHPFSPOT::$db in phpfspot.class.php
+
SQLite database handle to f-spot database
+
+
+ Variable + $db_access +
+
+
PHPFSPOT_CFG::$db_access in phpfspot_cfg.php
+
+
+ Method + db_check_table_exists +
+
+
PHPFSPOT_DB::db_check_table_exists() in phpfspot_db.php
+
PHPFSPOT_DB check table exists
+
+
+ Method + db_exec +
+
+
PHPFSPOT_DB::db_exec() in phpfspot_db.php
+
PHPFSPOT_DB database query & execute
+
+
+ Method + db_fetchSingleRow +
+
+
PHPFSPOT_DB::db_fetchSingleRow() in phpfspot_db.php
+
PHPFSPOT_DB fetch ONE row
+
+
+ Method + db_fetch_object +
+
+
PHPFSPOT_DB::db_fetch_object() in phpfspot_db.php
+
+
+ Method + db_getNumRows +
+
+
PHPFSPOT_DB::db_getNumRows() in phpfspot_db.php
+
PHPFSPOT_DB number of affected rows
+
+
+ Method + db_query +
+
+
PHPFSPOT_DB::db_query() in phpfspot_db.php
+
PHPFSPOT_DB database query
+
+
+ Method + delTag +
+
+
PHPFSPOT::delTag() in phpfspot.class.php
+
remove tag to users session variable
+
+
+ +
+
e
+ +
+
+
+
+ Variable + $error_found +
+
+
PHPFSPOT_CFG::$error_found in phpfspot_cfg.php
+
+
+ +
+
f
+ +
+
+
+
+ Variable + $fspot_db +
+
+
PHPFSPOT_CFG::$fspot_db in phpfspot_cfg.php
+
+
+ Page + find_dups.php +
+
+
find_dups.php in find_dups.php
+
+
+ +
+
g
+ +
+
+
+
+ Method + gen_thumb +
+
+
PHPFSPOT::gen_thumb() in phpfspot.class.php
+
Generates a thumbnail from photo idx
+
+
+ Page + gen_thumbs.php +
+
+
gen_thumbs.php in gen_thumbs.php
+
+
+ Method + getAvailableTags +
+
+
PHPFSPOT::getAvailableTags() in phpfspot.class.php
+
all available tags and tag cloud
+
+
+ Method + getCurrentPhoto +
+
+
PHPFSPOT::getCurrentPhoto() in phpfspot.class.php
+
return the current photo
+
+
+ Method + getExport +
+
+
PHPFSPOT::getExport() in phpfspot.class.php
+
output export page
+
+
+ Method + getFspotDBVersion +
+
+
PHPFSPOT::getFspotDBVersion() in phpfspot.class.php
+
retrive F-Spot database version
+
+
+ Method + getMD5 +
+
+
PHPFSPOT::getMD5() in phpfspot.class.php
+
returns stored md5 sum for a specific photo
+
+
+ Method + getNextSlideShowImage +
+
+
PHPFSPOT::getNextSlideShowImage() in phpfspot.class.php
+
return the next to be shown slide show image
+
+
+ Method + getPhotoName +
+
+
PHPFSPOT::getPhotoName() in phpfspot.class.php
+
returns aligned photo names
+
+
+ Method + getPhotoSelection +
+
+
PHPFSPOT::getPhotoSelection() in phpfspot.class.php
+
return all photo according selection
+
+
+ Method + getPrevSlideShowImage +
+
+
PHPFSPOT::getPrevSlideShowImage() in phpfspot.class.php
+
return the previous to be shown slide show image
+
+
+ Method + getRSSFeed +
+
+
PHPFSPOT::getRSSFeed() in phpfspot.class.php
+
output RSS feed
+
+
+ Method + getSelectedTags +
+
+
PHPFSPOT::getSelectedTags() in phpfspot.class.php
+
output all selected tags
+
+
+ Method + get_calendar_matrix +
+
+
PHPFSPOT::get_calendar_matrix() in phpfspot.class.php
+
output calendar matrix
+
+
+ Method + get_meta_informations +
+
+
PHPFSPOT::get_meta_informations() in phpfspot.class.php
+
return all exif meta data from the file
+
+
+ Method + get_num_photos +
+
+
PHPFSPOT::get_num_photos() in phpfspot.class.php
+
returns the number of photos which are tagged with $tag_id
+
+
+ Method + get_photo_details +
+
+
PHPFSPOT::get_photo_details() in phpfspot.class.php
+
extract all photo details
+
+
+ Method + get_random_photo +
+
+
PHPFSPOT::get_random_photo() in phpfspot.class.php
+
get random photo
+
+
+ Method + get_thumb_path +
+
+
PHPFSPOT::get_thumb_path() in phpfspot.class.php
+
returns the full path to a thumbnail
+
+
+ Method + get_xml_tag_list +
+
+
PHPFSPOT::get_xml_tag_list() in phpfspot.class.php
+
returns the value for the autocomplet tag-search
+
+
+ +
+
h
+ +
+
+
+
+ Variable + $hide_tags +
+
+
PHPFSPOT_CFG::$hide_tags in phpfspot_cfg.php
+
+
+ +
+
i
+ +
+
+
+
+ Page + index.php +
+
+
index.php in index.php
+
+
+ Method + isValidDate +
+
+
PHPFSPOT::isValidDate() in phpfspot.class.php
+
validates provided date
+
+
+ +
+
l
+ +
+
+
+
+ Variable + $logging +
+
+
PHPFSPOT_CFG::$logging in phpfspot_cfg.php
+
+
+ Variable + $log_file +
+
+
PHPFSPOT_CFG::$log_file in phpfspot_cfg.php
+
+
+ +
+
m
+ +
+
+
+
+ Variable + $mini_width +
+
+
PHPFSPOT_CFG::$mini_width in phpfspot_cfg.php
+
+
+ +
+
p
+ +
+
+
+
+ Variable + $page_title +
+
+
PHPFSPOT_CFG::$page_title in phpfspot_cfg.php
+
+
+ Variable + $path_replace_from +
+
+
PHPFSPOT_CFG::$path_replace_from in phpfspot_cfg.php
+
+
+ Variable + $path_replace_to +
+
+
PHPFSPOT_CFG::$path_replace_to in phpfspot_cfg.php
+
+
+ Variable + $photo_width +
+
+
PHPFSPOT_CFG::$photo_width in phpfspot_cfg.php
+
+
+ Variable + $phpfspot_db +
+
+
PHPFSPOT_CFG::$phpfspot_db in phpfspot_cfg.php
+
+
+ Method + parse_uri +
+
+
PHPFSPOT::parse_uri() in phpfspot.class.php
+
parse the provided URI and will returned the requested chunk
+
+
+ Class + PHPFSPOT +
+
+
PHPFSPOT in phpfspot.class.php
+
PHPFSPOT main class
+
+
+ Page + phpfspot.class.php +
+
+
phpfspot.class.php in phpfspot.class.php
+
+
+ Class + PHPFSPOT_CFG +
+
+
PHPFSPOT_CFG in phpfspot_cfg.php
+
+
+ Page + phpfspot_cfg.php +
+
+
phpfspot_cfg.php in phpfspot_cfg.php
+
+
+ Class + PHPFSPOT_DB +
+
+
PHPFSPOT_DB in phpfspot_db.php
+
PHPFSPOT_DB class
+
+
+ Page + phpfspot_db.php +
+
+
phpfspot_db.php in phpfspot_db.php
+
+
+ Class + PHPFSPOT_IMG +
+
+
PHPFSPOT_IMG in phpfspot_img.php
+
PHPFSPOT_IMG class
+
+
+ Page + phpfspot_img.php +
+
+
phpfspot_img.php in phpfspot_img.php
+
+
+ Class + PHPFSPOT_RPC +
+
+
PHPFSPOT_RPC in rpc.php
+
PHPFSPOT_RPC class
+
+
+ Class + PHPFSPOT_TMPL +
+
+
PHPFSPOT_TMPL in phpfspot_tmpl.php
+
PHPFSPOT_TMPL class
+
+
+ Page + phpfspot_tmpl.php +
+
+
phpfspot_tmpl.php in phpfspot_tmpl.php
+
+
+ Method + process_ajax_request +
+
+
PHPFSPOT_RPC::process_ajax_request() in rpc.php
+
+
+ +
+
r
+ +
+
+
+
+ Method + resetDateSearch +
+
+
PHPFSPOT::resetDateSearch() in phpfspot.class.php
+
reset date search
+
+
+ Method + resetNameSearch +
+
+
PHPFSPOT::resetNameSearch() in phpfspot.class.php
+
reset name search
+
+
+ Method + resetPhotoView +
+
+
PHPFSPOT::resetPhotoView() in phpfspot.class.php
+
reset single photo
+
+
+ Method + resetSlideShow +
+
+
PHPFSPOT::resetSlideShow() in phpfspot.class.php
+
+
+ Method + resetTags +
+
+
PHPFSPOT::resetTags() in phpfspot.class.php
+
reset tag selection
+
+
+ Method + resetTagSearch +
+
+
PHPFSPOT::resetTagSearch() in phpfspot.class.php
+
reset tag search
+
+
+ Page + rpc.php +
+
+
rpc.php in rpc.php
+
+
+ +
+
s
+ +
+
+
+
+ Variable + $smarty_path +
+
+
PHPFSPOT_CFG::$smarty_path in phpfspot_cfg.php
+
+
+ Method + setTagCondition +
+
+
PHPFSPOT::setTagCondition() in phpfspot.class.php
+
store current tag condition
+
+
+ Method + show +
+
+
PHPFSPOT_IMG::show() in phpfspot_img.php
+
sends the specified image to the browser
+
+
+ Method + show +
+
+
PHPFSPOT_TMPL::show() in phpfspot_tmpl.php
+
show template
+
+
+ Method + show +
+
+
PHPFSPOT::show() in phpfspot.class.php
+
show - generate html output
+
+
+ Method + showCredits +
+
+
PHPFSPOT::showCredits() in phpfspot.class.php
+
show credit template
+
+
+ Method + showPhoto +
+
+
PHPFSPOT::showPhoto() in phpfspot.class.php
+
control HTML ouput for a single photo
+
+
+ Method + showPhotoIndex +
+
+
PHPFSPOT::showPhotoIndex() in phpfspot.class.php
+
control HTML ouput for photo index
+
+
+ Method + showTextImage +
+
+
PHPFSPOT::showTextImage() in phpfspot.class.php
+
create on-the-fly images with text within
+
+
+ Method + smarty_sort_select_list +
+
+
PHPFSPOT::smarty_sort_select_list() in phpfspot.class.php
+
returns a select-dropdown box to select photo index sort parameters
+
+
+ Method + startSearch +
+
+
PHPFSPOT::startSearch() in phpfspot.class.php
+
invoke tag & date search
+
+
+ +
+
t
+ +
+
+
+
+ Variable + $tags +
+
+
PHPFSPOT::$tags in phpfspot.class.php
+
full tag - list
+
+
+ Variable + $theme_name +
+
+
PHPFSPOT_CFG::$theme_name in phpfspot_cfg.php
+
+
+ Variable + $thumbs_per_page +
+
+
PHPFSPOT_CFG::$thumbs_per_page in phpfspot_cfg.php
+
+
+ Variable + $thumb_height +
+
+
PHPFSPOT_CFG::$thumb_height in phpfspot_cfg.php
+
+
+ Variable + $thumb_path +
+
+
PHPFSPOT_CFG::$thumb_path in phpfspot_cfg.php
+
+
+ Variable + $thumb_width +
+
+
PHPFSPOT_CFG::$thumb_width in phpfspot_cfg.php
+
+
+ Variable + $tmpl +
+
+
PHPFSPOT::$tmpl in phpfspot.class.php
+
Smarty template engine
+
+
+ Method + translate_path +
+
+
PHPFSPOT::translate_path() in phpfspot.class.php
+
translate f-spoth photo path
+
+
+ +
+
u
+ +
+
+
+
+ Variable + $use_autocomplete +
+
+
PHPFSPOT_CFG::$use_autocomplete in phpfspot_cfg.php
+
+
+ Variable + $use_lightbox +
+
+
PHPFSPOT_CFG::$use_lightbox in phpfspot_cfg.php
+
+
+ Method + updateSortOrder +
+
+
PHPFSPOT::updateSortOrder() in phpfspot.class.php
+
updates sort order in session variable
+
+
+ +
+
w
+ +
+
+
+
+ Variable + $web_path +
+
+
PHPFSPOT_CFG::$web_path in phpfspot_cfg.php
+
+
+ Method + whatToDo +
+
+
PHPFSPOT::whatToDo() in phpfspot.class.php
+
tells the client browser what to do
+
+
+ +
+
_
+ +
+
+
+
+ Method + _error +
+
+
PHPFSPOT::_error() in phpfspot.class.php
+
output error text
+
+
+ Method + __construct +
+
+
PHPFSPOT_TMPL::__construct() in phpfspot_tmpl.php
+
class constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_RPC::__construct() in rpc.php
+
PHPFSPOT_RPC constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_IMG::__construct() in phpfspot_img.php
+
PHPFSPOT_IMG class constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_DB::__construct() in phpfspot_db.php
+
PHPFSPOT_DB class constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_CFG::__construct() in phpfspot_cfg.php
+
+
+ Method + __construct +
+
+
PHPFSPOT::__construct() in phpfspot.class.php
+
class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
+
+
+ Method + __destruct +
+
+
PHPFSPOT::__destruct() in phpfspot.class.php
+
+
+ Method + __destruct +
+
+
PHPFSPOT_IMG::__destruct() in phpfspot_img.php
+
PHPFSPOT_IMG class destructor
+
+
+ Method + __destruct +
+
+
PHPFSPOT_DB::__destruct() in phpfspot_db.php
+
PHPFSPOT_DB class deconstructor
+
+
+ +
+ a + b + c + d + e + f + g + h + i + l + m + p + r + s + t + u + w + _ +
+ \ No newline at end of file diff --git a/docs/elementindex_phpfspot.html b/docs/elementindex_phpfspot.html new file mode 100644 index 0000000..51cc660 --- /dev/null +++ b/docs/elementindex_phpfspot.html @@ -0,0 +1,1012 @@ + + + + + + + + + + + +

[phpfspot] element index

+All elements +
+
+ a + b + c + d + e + f + g + h + i + l + m + p + r + s + t + u + w + _ +
+ + +
+
_
+ +
+
+
+
+ Method + _error +
+
+
PHPFSPOT::_error() in phpfspot.class.php
+
output error text
+
+
+ Method + __construct +
+
+
PHPFSPOT_TMPL::__construct() in phpfspot_tmpl.php
+
class constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_RPC::__construct() in rpc.php
+
PHPFSPOT_RPC constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_IMG::__construct() in phpfspot_img.php
+
PHPFSPOT_IMG class constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_DB::__construct() in phpfspot_db.php
+
PHPFSPOT_DB class constructor
+
+
+ Method + __construct +
+
+
PHPFSPOT_CFG::__construct() in phpfspot_cfg.php
+
+
+ Method + __construct +
+
+
PHPFSPOT::__construct() in phpfspot.class.php
+
class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
+
+
+ Method + __destruct +
+
+
PHPFSPOT::__destruct() in phpfspot.class.php
+
+
+ Method + __destruct +
+
+
PHPFSPOT_IMG::__destruct() in phpfspot_img.php
+
PHPFSPOT_IMG class destructor
+
+
+ Method + __destruct +
+
+
PHPFSPOT_DB::__destruct() in phpfspot_db.php
+
PHPFSPOT_DB class deconstructor
+
+
+ +
+
a
+ +
+
+
+
+ Variable + $avail_tags +
+
+
PHPFSPOT::$avail_tags in phpfspot.class.php
+
list of available, not-selected, tags
+
+
+ Method + addTag +
+
+
PHPFSPOT::addTag() in phpfspot.class.php
+
add tag to users session variable
+
+
+ +
+
b
+ +
+
+
+
+ Variable + $base_path +
+
+
PHPFSPOT_CFG::$base_path in phpfspot_cfg.php
+
+
+ +
+
c
+ +
+
+
+
+ Variable + $cfg +
+
+
PHPFSPOT::$cfg in phpfspot.class.php
+
phpfspot configuration
+
+
+ Variable + $cfg_db +
+
+
PHPFSPOT::$cfg_db in phpfspot.class.php
+
SQLite database handle to phpfspot database
+
+
+ Method + checkifImageSupported +
+
+
PHPFSPOT::checkifImageSupported() in phpfspot.class.php
+
check if specified MIME type is supported
+
+
+ Method + check_config_table +
+
+
PHPFSPOT::check_config_table() in phpfspot.class.php
+
create phpfspot own sqlite database
+
+
+ Method + cleanup_phpfspot_db +
+
+
PHPFSPOT::cleanup_phpfspot_db() in phpfspot.class.php
+
cleanup phpfspot own database
+
+
+ Method + create_thumbnail +
+
+
PHPFSPOT::create_thumbnail() in phpfspot.class.php
+
create_thumbnails for the requested width
+
+
+ +
+
d
+ +
+
+
+
+ Variable + $db +
+
+
PHPFSPOT::$db in phpfspot.class.php
+
SQLite database handle to f-spot database
+
+
+ Variable + $db_access +
+
+
PHPFSPOT_CFG::$db_access in phpfspot_cfg.php
+
+
+ Method + db_check_table_exists +
+
+
PHPFSPOT_DB::db_check_table_exists() in phpfspot_db.php
+
PHPFSPOT_DB check table exists
+
+
+ Method + db_exec +
+
+
PHPFSPOT_DB::db_exec() in phpfspot_db.php
+
PHPFSPOT_DB database query & execute
+
+
+ Method + db_fetchSingleRow +
+
+
PHPFSPOT_DB::db_fetchSingleRow() in phpfspot_db.php
+
PHPFSPOT_DB fetch ONE row
+
+
+ Method + db_fetch_object +
+
+
PHPFSPOT_DB::db_fetch_object() in phpfspot_db.php
+
+
+ Method + db_getNumRows +
+
+
PHPFSPOT_DB::db_getNumRows() in phpfspot_db.php
+
PHPFSPOT_DB number of affected rows
+
+
+ Method + db_query +
+
+
PHPFSPOT_DB::db_query() in phpfspot_db.php
+
PHPFSPOT_DB database query
+
+
+ Method + delTag +
+
+
PHPFSPOT::delTag() in phpfspot.class.php
+
remove tag to users session variable
+
+
+ +
+
e
+ +
+
+
+
+ Variable + $error_found +
+
+
PHPFSPOT_CFG::$error_found in phpfspot_cfg.php
+
+
+ +
+
f
+ +
+
+
+
+ Variable + $fspot_db +
+
+
PHPFSPOT_CFG::$fspot_db in phpfspot_cfg.php
+
+
+ Page + find_dups.php +
+
+
find_dups.php in find_dups.php
+
+
+ +
+
g
+ +
+
+
+
+ Method + gen_thumb +
+
+
PHPFSPOT::gen_thumb() in phpfspot.class.php
+
Generates a thumbnail from photo idx
+
+
+ Page + gen_thumbs.php +
+
+
gen_thumbs.php in gen_thumbs.php
+
+
+ Method + getAvailableTags +
+
+
PHPFSPOT::getAvailableTags() in phpfspot.class.php
+
all available tags and tag cloud
+
+
+ Method + getCurrentPhoto +
+
+
PHPFSPOT::getCurrentPhoto() in phpfspot.class.php
+
return the current photo
+
+
+ Method + getExport +
+
+
PHPFSPOT::getExport() in phpfspot.class.php
+
output export page
+
+
+ Method + getFspotDBVersion +
+
+
PHPFSPOT::getFspotDBVersion() in phpfspot.class.php
+
retrive F-Spot database version
+
+
+ Method + getMD5 +
+
+
PHPFSPOT::getMD5() in phpfspot.class.php
+
returns stored md5 sum for a specific photo
+
+
+ Method + getNextSlideShowImage +
+
+
PHPFSPOT::getNextSlideShowImage() in phpfspot.class.php
+
return the next to be shown slide show image
+
+
+ Method + getPhotoName +
+
+
PHPFSPOT::getPhotoName() in phpfspot.class.php
+
returns aligned photo names
+
+
+ Method + getPhotoSelection +
+
+
PHPFSPOT::getPhotoSelection() in phpfspot.class.php
+
return all photo according selection
+
+
+ Method + getPrevSlideShowImage +
+
+
PHPFSPOT::getPrevSlideShowImage() in phpfspot.class.php
+
return the previous to be shown slide show image
+
+
+ Method + getRSSFeed +
+
+
PHPFSPOT::getRSSFeed() in phpfspot.class.php
+
output RSS feed
+
+
+ Method + getSelectedTags +
+
+
PHPFSPOT::getSelectedTags() in phpfspot.class.php
+
output all selected tags
+
+
+ Method + get_calendar_matrix +
+
+
PHPFSPOT::get_calendar_matrix() in phpfspot.class.php
+
output calendar matrix
+
+
+ Method + get_meta_informations +
+
+
PHPFSPOT::get_meta_informations() in phpfspot.class.php
+
return all exif meta data from the file
+
+
+ Method + get_num_photos +
+
+
PHPFSPOT::get_num_photos() in phpfspot.class.php
+
returns the number of photos which are tagged with $tag_id
+
+
+ Method + get_photo_details +
+
+
PHPFSPOT::get_photo_details() in phpfspot.class.php
+
extract all photo details
+
+
+ Method + get_random_photo +
+
+
PHPFSPOT::get_random_photo() in phpfspot.class.php
+
get random photo
+
+
+ Method + get_thumb_path +
+
+
PHPFSPOT::get_thumb_path() in phpfspot.class.php
+
returns the full path to a thumbnail
+
+
+ Method + get_xml_tag_list +
+
+
PHPFSPOT::get_xml_tag_list() in phpfspot.class.php
+
returns the value for the autocomplet tag-search
+
+
+ +
+
h
+ +
+
+
+
+ Variable + $hide_tags +
+
+
PHPFSPOT_CFG::$hide_tags in phpfspot_cfg.php
+
+
+ +
+
i
+ +
+
+
+
+ Page + index.php +
+
+
index.php in index.php
+
+
+ Method + isValidDate +
+
+
PHPFSPOT::isValidDate() in phpfspot.class.php
+
validates provided date
+
+
+ +
+
l
+ +
+
+
+
+ Variable + $logging +
+
+
PHPFSPOT_CFG::$logging in phpfspot_cfg.php
+
+
+ Variable + $log_file +
+
+
PHPFSPOT_CFG::$log_file in phpfspot_cfg.php
+
+
+ +
+
m
+ +
+
+
+
+ Variable + $mini_width +
+
+
PHPFSPOT_CFG::$mini_width in phpfspot_cfg.php
+
+
+ +
+
p
+ +
+
+
+
+ Variable + $page_title +
+
+
PHPFSPOT_CFG::$page_title in phpfspot_cfg.php
+
+
+ Variable + $path_replace_from +
+
+
PHPFSPOT_CFG::$path_replace_from in phpfspot_cfg.php
+
+
+ Variable + $path_replace_to +
+
+
PHPFSPOT_CFG::$path_replace_to in phpfspot_cfg.php
+
+
+ Variable + $photo_width +
+
+
PHPFSPOT_CFG::$photo_width in phpfspot_cfg.php
+
+
+ Variable + $phpfspot_db +
+
+
PHPFSPOT_CFG::$phpfspot_db in phpfspot_cfg.php
+
+
+ Method + parse_uri +
+
+
PHPFSPOT::parse_uri() in phpfspot.class.php
+
parse the provided URI and will returned the requested chunk
+
+
+ Class + PHPFSPOT +
+
+
PHPFSPOT in phpfspot.class.php
+
PHPFSPOT main class
+
+
+ Page + phpfspot.class.php +
+
+
phpfspot.class.php in phpfspot.class.php
+
+
+ Class + PHPFSPOT_CFG +
+
+
PHPFSPOT_CFG in phpfspot_cfg.php
+
+
+ Page + phpfspot_cfg.php +
+
+
phpfspot_cfg.php in phpfspot_cfg.php
+
+
+ Class + PHPFSPOT_DB +
+
+
PHPFSPOT_DB in phpfspot_db.php
+
PHPFSPOT_DB class
+
+
+ Page + phpfspot_db.php +
+
+
phpfspot_db.php in phpfspot_db.php
+
+
+ Class + PHPFSPOT_IMG +
+
+
PHPFSPOT_IMG in phpfspot_img.php
+
PHPFSPOT_IMG class
+
+
+ Page + phpfspot_img.php +
+
+
phpfspot_img.php in phpfspot_img.php
+
+
+ Class + PHPFSPOT_RPC +
+
+
PHPFSPOT_RPC in rpc.php
+
PHPFSPOT_RPC class
+
+
+ Class + PHPFSPOT_TMPL +
+
+
PHPFSPOT_TMPL in phpfspot_tmpl.php
+
PHPFSPOT_TMPL class
+
+
+ Page + phpfspot_tmpl.php +
+
+
phpfspot_tmpl.php in phpfspot_tmpl.php
+
+
+ Method + process_ajax_request +
+
+
PHPFSPOT_RPC::process_ajax_request() in rpc.php
+
+
+ +
+
r
+ +
+
+
+
+ Method + resetDateSearch +
+
+
PHPFSPOT::resetDateSearch() in phpfspot.class.php
+
reset date search
+
+
+ Method + resetNameSearch +
+
+
PHPFSPOT::resetNameSearch() in phpfspot.class.php
+
reset name search
+
+
+ Method + resetPhotoView +
+
+
PHPFSPOT::resetPhotoView() in phpfspot.class.php
+
reset single photo
+
+
+ Method + resetSlideShow +
+
+
PHPFSPOT::resetSlideShow() in phpfspot.class.php
+
+
+ Method + resetTags +
+
+
PHPFSPOT::resetTags() in phpfspot.class.php
+
reset tag selection
+
+
+ Method + resetTagSearch +
+
+
PHPFSPOT::resetTagSearch() in phpfspot.class.php
+
reset tag search
+
+
+ Page + rpc.php +
+
+
rpc.php in rpc.php
+
+
+ +
+
s
+ +
+
+
+
+ Variable + $smarty_path +
+
+
PHPFSPOT_CFG::$smarty_path in phpfspot_cfg.php
+
+
+ Method + setTagCondition +
+
+
PHPFSPOT::setTagCondition() in phpfspot.class.php
+
store current tag condition
+
+
+ Method + show +
+
+
PHPFSPOT_IMG::show() in phpfspot_img.php
+
sends the specified image to the browser
+
+
+ Method + show +
+
+
PHPFSPOT_TMPL::show() in phpfspot_tmpl.php
+
show template
+
+
+ Method + show +
+
+
PHPFSPOT::show() in phpfspot.class.php
+
show - generate html output
+
+
+ Method + showCredits +
+
+
PHPFSPOT::showCredits() in phpfspot.class.php
+
show credit template
+
+
+ Method + showPhoto +
+
+
PHPFSPOT::showPhoto() in phpfspot.class.php
+
control HTML ouput for a single photo
+
+
+ Method + showPhotoIndex +
+
+
PHPFSPOT::showPhotoIndex() in phpfspot.class.php
+
control HTML ouput for photo index
+
+
+ Method + showTextImage +
+
+
PHPFSPOT::showTextImage() in phpfspot.class.php
+
create on-the-fly images with text within
+
+
+ Method + smarty_sort_select_list +
+
+
PHPFSPOT::smarty_sort_select_list() in phpfspot.class.php
+
returns a select-dropdown box to select photo index sort parameters
+
+
+ Method + startSearch +
+
+
PHPFSPOT::startSearch() in phpfspot.class.php
+
invoke tag & date search
+
+
+ +
+
t
+ +
+
+
+
+ Variable + $tags +
+
+
PHPFSPOT::$tags in phpfspot.class.php
+
full tag - list
+
+
+ Variable + $theme_name +
+
+
PHPFSPOT_CFG::$theme_name in phpfspot_cfg.php
+
+
+ Variable + $thumbs_per_page +
+
+
PHPFSPOT_CFG::$thumbs_per_page in phpfspot_cfg.php
+
+
+ Variable + $thumb_height +
+
+
PHPFSPOT_CFG::$thumb_height in phpfspot_cfg.php
+
+
+ Variable + $thumb_path +
+
+
PHPFSPOT_CFG::$thumb_path in phpfspot_cfg.php
+
+
+ Variable + $thumb_width +
+
+
PHPFSPOT_CFG::$thumb_width in phpfspot_cfg.php
+
+
+ Variable + $tmpl +
+
+
PHPFSPOT::$tmpl in phpfspot.class.php
+
Smarty template engine
+
+
+ Method + translate_path +
+
+
PHPFSPOT::translate_path() in phpfspot.class.php
+
translate f-spoth photo path
+
+
+ +
+
u
+ +
+
+
+
+ Variable + $use_autocomplete +
+
+
PHPFSPOT_CFG::$use_autocomplete in phpfspot_cfg.php
+
+
+ Variable + $use_lightbox +
+
+
PHPFSPOT_CFG::$use_lightbox in phpfspot_cfg.php
+
+
+ Method + updateSortOrder +
+
+
PHPFSPOT::updateSortOrder() in phpfspot.class.php
+
updates sort order in session variable
+
+
+ +
+
w
+ +
+
+
+
+ Variable + $web_path +
+
+
PHPFSPOT_CFG::$web_path in phpfspot_cfg.php
+
+
+ Method + whatToDo +
+
+
PHPFSPOT::whatToDo() in phpfspot.class.php
+
tells the client browser what to do
+
+
+ +
+ a + b + c + d + e + f + g + h + i + l + m + p + r + s + t + u + w + _ +
+ \ No newline at end of file diff --git a/docs/errors.html b/docs/errors.html new file mode 100644 index 0000000..16075cd --- /dev/null +++ b/docs/errors.html @@ -0,0 +1,66 @@ + + + + + + phpDocumentor Parser Errors and Warnings + + + + + Post-parsing
+gen_thumbs.php
+index.php
+phpfspot.class.php
+phpfspot_cfg.php
+phpfspot_db.php
+phpfspot_img.php
+phpfspot_tmpl.php
+rpc.php
+ +

Post-parsing

+

Warnings:


+Warning - Class PHPFSPOT_TMPL parent Smarty not found
+ +

find_dups.php

+

Warnings:


+Warning on line 56 - File "/var/www/beau.netshadow.at/htdocs/find_dups.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+ +

gen_thumbs.php

+

Warnings:


+Warning on line 90 - File "/var/www/beau.netshadow.at/htdocs/gen_thumbs.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+ +

index.php

+

Warnings:


+Warning on line 29 - File "/var/www/beau.netshadow.at/htdocs/index.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+ +

phpfspot.class.php

+

Warnings:


+Warning on line 2567 - Unknown tag "@retrun" used
+Warning on line 2796 - File "/var/www/beau.netshadow.at/htdocs/phpfspot.class.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+ +

phpfspot_cfg.php

+

Warnings:


+Warning on line 2 - no @package tag was used in a DocBlock for class PHPFSPOT_CFG
+Warning on line 83 - File "/var/www/beau.netshadow.at/htdocs/phpfspot_cfg.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+ +

phpfspot_db.php

+

Warnings:


+Warning on line 28 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/phpfspot_db.php
+ +

phpfspot_img.php

+

Warnings:


+Warning on line 142 - File "/var/www/beau.netshadow.at/htdocs/phpfspot_img.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+ +

phpfspot_tmpl.php

+

Warnings:


+Warning on line 30 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/phpfspot_tmpl.php
+ +

rpc.php

+

Warnings:


+Warning on line 178 - File "/var/www/beau.netshadow.at/htdocs/rpc.php" has no page-level DocBlock, use @package in the first DocBlock to create one
+

+ Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2 +

+ + \ No newline at end of file diff --git a/docs/index.html b/docs/index.html new file mode 100644 index 0000000..ac623fd --- /dev/null +++ b/docs/index.html @@ -0,0 +1,24 @@ + + + + + + phpfspot source-code documentation + + + + + + + + + + + <H2>Frame Alert</H2> + <P>This document is designed to be viewed using the frames feature. + If you see this message, you are using a non-frame-capable web client.</P> + + + \ No newline at end of file diff --git a/docs/li_phpfspot.html b/docs/li_phpfspot.html new file mode 100644 index 0000000..9173f8f --- /dev/null +++ b/docs/li_phpfspot.html @@ -0,0 +1,47 @@ + + + + + + + + + + +
phpfspot
+
+ +
+ +
Description
+
+ Class trees
+ Index of elements
+
+ + + +
Classes
+
ClassPHPFSPOT
+
ClassPHPFSPOT_CFG
+
ClassPHPFSPOT_DB
+
ClassPHPFSPOT_IMG
+
ClassPHPFSPOT_RPC
+
ClassPHPFSPOT_TMPL
+
Files
+
Filefind_dups.php
+
Filegen_thumbs.php
+
Fileindex.php
+
Filephpfspot.class.php
+
Filephpfspot_cfg.php
+
Filephpfspot_db.php
+
Filephpfspot_img.php
+
Filephpfspot_tmpl.php
+
Filerpc.php
+ + +
+
+

phpDocumentor v 1.4.2

+ + \ No newline at end of file diff --git a/docs/media/banner.css b/docs/media/banner.css new file mode 100644 index 0000000..032b037 --- /dev/null +++ b/docs/media/banner.css @@ -0,0 +1,33 @@ +body +{ + background-color: #EEEEEE; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ + +.banner { } + +.banner-menu +{ + text-align: right; + clear: both; + padding: .5em; + border-top: 2px solid #AAAAAA; +} + +.banner-title +{ + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector +{ + background-color: #DDDDDD; + border: 1px solid #AAAAAA; + color: #000090; +} diff --git a/docs/media/images/AbstractClass.png b/docs/media/images/AbstractClass.png new file mode 100644 index 0000000..afa9d1d Binary files /dev/null and b/docs/media/images/AbstractClass.png differ diff --git a/docs/media/images/AbstractClass_logo.png b/docs/media/images/AbstractClass_logo.png new file mode 100644 index 0000000..8f65c39 Binary files /dev/null and b/docs/media/images/AbstractClass_logo.png differ diff --git a/docs/media/images/AbstractMethod.png b/docs/media/images/AbstractMethod.png new file mode 100644 index 0000000..605ccbe Binary files /dev/null and b/docs/media/images/AbstractMethod.png differ diff --git a/docs/media/images/AbstractPrivateClass.png b/docs/media/images/AbstractPrivateClass.png new file mode 100644 index 0000000..53d76c6 Binary files /dev/null and b/docs/media/images/AbstractPrivateClass.png differ diff --git a/docs/media/images/AbstractPrivateClass_logo.png b/docs/media/images/AbstractPrivateClass_logo.png new file mode 100644 index 0000000..4e68f57 Binary files /dev/null and b/docs/media/images/AbstractPrivateClass_logo.png differ diff --git a/docs/media/images/AbstractPrivateMethod.png b/docs/media/images/AbstractPrivateMethod.png new file mode 100644 index 0000000..41cc9f0 Binary files /dev/null and b/docs/media/images/AbstractPrivateMethod.png differ diff --git a/docs/media/images/Class.png b/docs/media/images/Class.png new file mode 100644 index 0000000..cf548d2 Binary files /dev/null and b/docs/media/images/Class.png differ diff --git a/docs/media/images/Class_logo.png b/docs/media/images/Class_logo.png new file mode 100644 index 0000000..6f223c4 Binary files /dev/null and b/docs/media/images/Class_logo.png differ diff --git a/docs/media/images/Constant.png b/docs/media/images/Constant.png new file mode 100644 index 0000000..a9c6f28 Binary files /dev/null and b/docs/media/images/Constant.png differ diff --git a/docs/media/images/Constructor.png b/docs/media/images/Constructor.png new file mode 100644 index 0000000..3f16222 Binary files /dev/null and b/docs/media/images/Constructor.png differ diff --git a/docs/media/images/Destructor.png b/docs/media/images/Destructor.png new file mode 100644 index 0000000..f28528f Binary files /dev/null and b/docs/media/images/Destructor.png differ diff --git a/docs/media/images/Function.png b/docs/media/images/Function.png new file mode 100644 index 0000000..902fe25 Binary files /dev/null and b/docs/media/images/Function.png differ diff --git a/docs/media/images/Global.png b/docs/media/images/Global.png new file mode 100644 index 0000000..7281bd2 Binary files /dev/null and b/docs/media/images/Global.png differ diff --git a/docs/media/images/I.png b/docs/media/images/I.png new file mode 100644 index 0000000..e8512fb Binary files /dev/null and b/docs/media/images/I.png differ diff --git a/docs/media/images/Index.png b/docs/media/images/Index.png new file mode 100644 index 0000000..6558ec3 Binary files /dev/null and b/docs/media/images/Index.png differ diff --git a/docs/media/images/Interface.png b/docs/media/images/Interface.png new file mode 100644 index 0000000..e6cd51e Binary files /dev/null and b/docs/media/images/Interface.png differ diff --git a/docs/media/images/Interface_logo.png b/docs/media/images/Interface_logo.png new file mode 100644 index 0000000..6f223c4 Binary files /dev/null and b/docs/media/images/Interface_logo.png differ diff --git a/docs/media/images/L.png b/docs/media/images/L.png new file mode 100644 index 0000000..eb334ed Binary files /dev/null and b/docs/media/images/L.png differ diff --git a/docs/media/images/Lminus.png b/docs/media/images/Lminus.png new file mode 100644 index 0000000..f7c43c0 Binary files /dev/null and b/docs/media/images/Lminus.png differ diff --git a/docs/media/images/Lplus.png b/docs/media/images/Lplus.png new file mode 100644 index 0000000..848ec2f Binary files /dev/null and b/docs/media/images/Lplus.png differ diff --git a/docs/media/images/Method.png b/docs/media/images/Method.png new file mode 100644 index 0000000..9b21578 Binary files /dev/null and b/docs/media/images/Method.png differ diff --git a/docs/media/images/Page.png b/docs/media/images/Page.png new file mode 100644 index 0000000..ffe7986 Binary files /dev/null and b/docs/media/images/Page.png differ diff --git a/docs/media/images/Page_logo.png b/docs/media/images/Page_logo.png new file mode 100644 index 0000000..44ce0b3 Binary files /dev/null and b/docs/media/images/Page_logo.png differ diff --git a/docs/media/images/PrivateClass.png b/docs/media/images/PrivateClass.png new file mode 100644 index 0000000..470e6d5 Binary files /dev/null and b/docs/media/images/PrivateClass.png differ diff --git a/docs/media/images/PrivateClass_logo.png b/docs/media/images/PrivateClass_logo.png new file mode 100644 index 0000000..590e006 Binary files /dev/null and b/docs/media/images/PrivateClass_logo.png differ diff --git a/docs/media/images/PrivateMethod.png b/docs/media/images/PrivateMethod.png new file mode 100644 index 0000000..d01f2b3 Binary files /dev/null and b/docs/media/images/PrivateMethod.png differ diff --git a/docs/media/images/PrivateVariable.png b/docs/media/images/PrivateVariable.png new file mode 100644 index 0000000..d76b21d Binary files /dev/null and b/docs/media/images/PrivateVariable.png differ diff --git a/docs/media/images/StaticMethod.png b/docs/media/images/StaticMethod.png new file mode 100644 index 0000000..9b21578 Binary files /dev/null and b/docs/media/images/StaticMethod.png differ diff --git a/docs/media/images/StaticVariable.png b/docs/media/images/StaticVariable.png new file mode 100644 index 0000000..8e82019 Binary files /dev/null and b/docs/media/images/StaticVariable.png differ diff --git a/docs/media/images/T.png b/docs/media/images/T.png new file mode 100644 index 0000000..3017325 Binary files /dev/null and b/docs/media/images/T.png differ diff --git a/docs/media/images/Tminus.png b/docs/media/images/Tminus.png new file mode 100644 index 0000000..2260e42 Binary files /dev/null and b/docs/media/images/Tminus.png differ diff --git a/docs/media/images/Tplus.png b/docs/media/images/Tplus.png new file mode 100644 index 0000000..2c8d8f4 Binary files /dev/null and b/docs/media/images/Tplus.png differ diff --git a/docs/media/images/Variable.png b/docs/media/images/Variable.png new file mode 100644 index 0000000..8e82019 Binary files /dev/null and b/docs/media/images/Variable.png differ diff --git a/docs/media/images/blank.png b/docs/media/images/blank.png new file mode 100644 index 0000000..cee9cd3 Binary files /dev/null and b/docs/media/images/blank.png differ diff --git a/docs/media/images/class_folder.png b/docs/media/images/class_folder.png new file mode 100644 index 0000000..84e9587 Binary files /dev/null and b/docs/media/images/class_folder.png differ diff --git a/docs/media/images/empty.png b/docs/media/images/empty.png new file mode 100644 index 0000000..d568386 Binary files /dev/null and b/docs/media/images/empty.png differ diff --git a/docs/media/images/file.png b/docs/media/images/file.png new file mode 100644 index 0000000..0bb2427 Binary files /dev/null and b/docs/media/images/file.png differ diff --git a/docs/media/images/folder.png b/docs/media/images/folder.png new file mode 100644 index 0000000..a2d79f8 Binary files /dev/null and b/docs/media/images/folder.png differ diff --git a/docs/media/images/function_folder.png b/docs/media/images/function_folder.png new file mode 100644 index 0000000..8b3d6e3 Binary files /dev/null and b/docs/media/images/function_folder.png differ diff --git a/docs/media/images/next_button.png b/docs/media/images/next_button.png new file mode 100644 index 0000000..cdbc615 Binary files /dev/null and b/docs/media/images/next_button.png differ diff --git a/docs/media/images/next_button_disabled.png b/docs/media/images/next_button_disabled.png new file mode 100644 index 0000000..4a11780 Binary files /dev/null and b/docs/media/images/next_button_disabled.png differ diff --git a/docs/media/images/package.png b/docs/media/images/package.png new file mode 100644 index 0000000..b04cf56 Binary files /dev/null and b/docs/media/images/package.png differ diff --git a/docs/media/images/package_folder.png b/docs/media/images/package_folder.png new file mode 100644 index 0000000..6162baf Binary files /dev/null and b/docs/media/images/package_folder.png differ diff --git a/docs/media/images/previous_button.png b/docs/media/images/previous_button.png new file mode 100644 index 0000000..327fdbc Binary files /dev/null and b/docs/media/images/previous_button.png differ diff --git a/docs/media/images/previous_button_disabled.png b/docs/media/images/previous_button_disabled.png new file mode 100644 index 0000000..c02ff64 Binary files /dev/null and b/docs/media/images/previous_button_disabled.png differ diff --git a/docs/media/images/private_class_logo.png b/docs/media/images/private_class_logo.png new file mode 100644 index 0000000..590e006 Binary files /dev/null and b/docs/media/images/private_class_logo.png differ diff --git a/docs/media/images/tutorial.png b/docs/media/images/tutorial.png new file mode 100644 index 0000000..bc19737 Binary files /dev/null and b/docs/media/images/tutorial.png differ diff --git a/docs/media/images/tutorial_folder.png b/docs/media/images/tutorial_folder.png new file mode 100644 index 0000000..2a468b2 Binary files /dev/null and b/docs/media/images/tutorial_folder.png differ diff --git a/docs/media/images/up_button.png b/docs/media/images/up_button.png new file mode 100644 index 0000000..ff36c59 Binary files /dev/null and b/docs/media/images/up_button.png differ diff --git a/docs/media/stylesheet.css b/docs/media/stylesheet.css new file mode 100644 index 0000000..96729b6 --- /dev/null +++ b/docs/media/stylesheet.css @@ -0,0 +1,146 @@ +a { color: #000090; text-decoration: none; } +a:hover, a:active, a:focus { color: highlighttext; background-color: highlight; text-decoration: none; } + +body { background: #FFFFFF; } +body, table { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; } + +a img { border: 0px; } + +/* Page layout/boxes */ + +.info-box { } +.info-box-title { margin: 1em 0em 0em 0em; font-weight: normal; font-size: 14pt; color: #999999; border-bottom: 2px solid #999999; } +.info-box-body { border: 1px solid #999999; padding: .5em; } +.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; } + +.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em} +.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em} + +.page-body { max-width: 800px; margin: auto; } +.tree { white-space: nowrap; font: icon } +.tree dd { margin-left: 19px } +.tree dl { margin: 0px } +.tree-icon { vertical-align: middle; border: 0px; margin-right: 3px } + +/* Index formatting classes */ + +.index-item-body { margin-top: .5em; margin-bottom: .5em} +.index-item-description { margin-top: .25em } +.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt } +.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em} +.index-letter-title { font-size: 12pt; font-weight: bold } +.index-letter-menu { text-align: center; margin: 1em } +.index-letter { font-size: 12pt } + +/* Docbook classes */ + +.description {} +.short-description { font-weight: bold; color: #666666; } +.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; } +.parameters { padding-left: 0em; margin-left: 3em; color: #014fbe; list-style-type: square; } +.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; } +.package { font-weight: bold; } +.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black } +.package-details { font-size: 85%; } +.sub-package { font-weight: bold; } +.tutorial { border-width: thin; border-color: #0066ff; } +.tutorial-nav-box { width: 100%; border: 1px solid #999999; background-color: #F8F8F8; } +.folder-title { font-style: italic; font-family: Verdana, Arial, Helvetica, sans-serif } + +/* Generic formatting */ + +.field { font-weight: bold; } +.detail { font-size: 8pt; } +.notes { font-style: italic; font-size: 8pt; } +.separator { background-color: #999999; height: 2px; } +.warning { color: #FF6600; } +.disabled { font-style: italic; color: #999999; } + +/* Code elements */ + +.line-number { } + +.class-table { width: 100%; } +.class-table-header { border-bottom: 1px dotted #666666; text-align: left} +.class-name { color: #0000AA; font-weight: bold; } + +.method-summary { color: #009000; padding-left: 1em; font-size: 8pt; } +.method-header { } +.method-definition { margin-bottom: .2em } +.method-title { color: #009000; font-weight: bold; } +.method-name { font-weight: bold; } +.method-signature { font-size: 85%; color: #666666; margin: .5em 0em } +.method-result { font-style: italic; } + +.var-summary { padding-left: 1em; font-size: 8pt; } +.var-header { } +.var-title { color: #014fbe; margin-bottom: .3em } +.var-type { font-style: italic; } +.var-name { font-weight: bold; } +.var-default {} +.var-description { font-weight: normal; color: #000000; } + +.include-title { color: #014fbe;} +.include-type { font-style: italic; } +.include-name { font-weight: bold; } + +.const-title { color: #FF6600; } +.const-name { font-weight: bold; } + +/* Syntax highlighting */ + +.src-code { font-family: 'Courier New', Courier, monospace; font-weight: normal; } +.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; } + +.src-code a:link { padding: 1px; text-decoration: underline; color: #0000DD; } +.src-code a:visited { text-decoration: underline; color: #0000DD; } +.src-code a:active { background-color: #FFFF66; color: #008000; } +.src-code a:hover { background-color: #FFFF66; text-decoration: overline underline; color: #008000; } + +.src-comm { color: #666666; } +.src-id { color: #FF6600; font-style: italic; } +.src-inc { color: #0000AA; font-weight: bold; } +.src-key { color: #0000AA; font-weight: bold; } +.src-num { color: #CC0000; } +.src-str { color: #CC0000; } +.src-sym { } +.src-var { } + +.src-php { font-weight: bold; } + +.src-doc { color: #666666; } +.src-doc-close-template { color: #666666 } +.src-doc-coretag { color: #008000; } +.src-doc-inlinetag {} +.src-doc-internal {} +.src-doc-tag { color: #0080CC; } +.src-doc-template { color: #666666 } +.src-doc-type { font-style: italic; color: #444444 } +.src-doc-var { color: #444444 } + +.tute-tag { color: #009999 } +.tute-attribute-name { color: #0000FF } +.tute-attribute-value { color: #0099FF } +.tute-entity { font-weight: bold; } +.tute-comment { font-style: italic } +.tute-inline-tag { color: #636311; font-weight: bold } + +/* tutorial */ + +.authors { } +.author { font-style: italic; font-weight: bold } +.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal } +.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; } +*[class="example"] { line-height : 1.0em; } +.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; } +*[class="listing"] { line-height : 1.0em; } +.release-info { font-size: 85%; font-style: italic; margin: 1em 0em } +.ref-title-box { } +.ref-title { } +.ref-purpose { font-style: italic; color: #666666 } +.ref-synopsis { } +.title { font-weight: bold; border-bottom: 1px solid #999999; color: #999999; } +.cmd-synopsis { margin: 1em 0em } +.cmd-title { font-weight: bold } +.toc { margin-left: 2em; padding-left: 0em } + diff --git a/docs/packages.html b/docs/packages.html new file mode 100644 index 0000000..2293be8 --- /dev/null +++ b/docs/packages.html @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/phpfspot/PHPFSPOT.html b/docs/phpfspot/PHPFSPOT.html new file mode 100644 index 0000000..62e0947 --- /dev/null +++ b/docs/phpfspot/PHPFSPOT.html @@ -0,0 +1,1929 @@ + + + + + + Docs For Class PHPFSPOT + + + + +
+

Class PHPFSPOT

+ + +
+
Description
+
+ Description | + Vars (details) + | Methods (details) + +
+
+ +

PHPFSPOT main class

+

+ Located in /phpfspot.class.php (line 33) +

+ + + 

+	
+			

+

+
+
+
+	
+	

+		
Variable Summary

+		

+			Description |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								

+		

+			

+																																																																

+					 
+					array
+					$avail_tags
+				

+																

+					 
+					PHPFSPOT_CFG
+					$cfg
+				

+																

+					 
+					PHPFSPOT_DB
+					$cfg_db
+				

+																

+					 
+					PHPFSPOT_DB
+					$db
+				

+																

+					 
+					array
+					$tags
+				

+																

+					 
+					PHPFSPOT_TMPL
+					$tmpl
+				

+											

+		

+	

+
+	
+	

+		
Method Summary

+		

+			Description |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		

+		
			
+			

+																																																																																																																																																																																																																																																																																																																																																																																																								

+					 
+											PHPFSPOT
+										__construct
+										()
+									

+																

+					 
+											void
+										__destruct
+										()
+									

+																

+					 
+											string
+										addTag
+											( $tag)
+									

+																

+					 
+											boolean
+										checkifImageSupported
+											(string $mime)
+									

+																

+					 
+											void
+										check_config_table
+										()
+									

+																

+					 
+											void
+										cleanup_phpfspot_db
+										()
+									

+																

+					 
+											boolean
+										create_thumbnail
+											(string $orig_image, string $thumb_image, integer $width)
+									

+																

+					 
+											string
+										delTag
+											(string $tag)
+									

+																

+					 
+											void
+										gen_thumb
+											([integer $idx = 0], [integer $force = 0], [boolean $overwrite = false])
+									

+																

+					 
+											void
+										getAvailableTags
+										()
+									

+																

+					 
+											void
+										getCurrentPhoto
+										()
+									

+																

+					 
+											void
+										getExport
+											(string $mode)
+									

+																

+					 
+											string|null
+										getFspotDBVersion
+										()
+									

+																

+					 
+											string|null
+										getMD5
+											(integer $idx)
+									

+																

+					 
+											string
+										getNextSlideShowImage
+										()
+									

+																

+					 
+											string|null
+										getPhotoName
+											(integer $idx, [integer $limit = 0])
+									

+																

+					 
+											array
+										getPhotoSelection
+										()
+									

+																

+					 
+											string
+										getPrevSlideShowImage
+										()
+									

+																

+					 
+											void
+										getRSSFeed
+										()
+									

+																

+					 
+											string
+										getSelectedTags
+										()
+									

+																

+					 
+											void
+										get_calendar_matrix
+											([integer $year = 0], [integer $month = 0], [integer $day = 0])
+									

+																

+					 
+											array
+										get_meta_informations
+											(string $file)
+									

+																

+					 
+											integer
+										get_num_photos
+											(integer $tag_id)
+									

+																

+					 
+											object|null
+										get_photo_details
+											(integer $idx)
+									

+																

+					 
+											array
+										get_random_photo
+										()
+									

+																

+					 
+											string
+										get_thumb_path
+											(integer $width, integer $photo)
+									

+																

+					 
+											string
+										get_xml_tag_list
+										()
+									

+																

+					 
+											boolean
+										isValidDate
+											(string $date_str)
+									

+																

+					 
+											string
+										parse_uri
+											(string $uri, string $mode)
+									

+																

+					 
+											void
+										resetDateSearch
+										()
+									

+																

+					 
+											void
+										resetNameSearch
+										()
+									

+																

+					 
+											void
+										resetPhotoView
+										()
+									

+																

+					 
+											void
+										resetSlideShow
+										()
+									

+																

+					 
+											void
+										resetTags
+										()
+									

+																

+					 
+											void
+										resetTagSearch
+										()
+									

+																

+					 
+											string
+										setTagCondition
+											(string $mode)
+									

+																

+					 
+											void
+										show
+										()
+									

+																

+					 
+											void
+										showCredits
+										()
+									

+																

+					 
+											void
+										showPhoto
+											(integer $photo)
+									

+																

+					 
+											void
+										showPhotoIndex
+										()
+									

+																

+					 
+											void
+										showTextImage
+											(string $txt, [string $color = 000000], [integer $space = 4], [integer $font = 4], [integer $w = 300])
+									

+																

+					 
+											string
+										smarty_sort_select_list
+											(array $params,  &$smarty, smarty $smarty)
+									

+																

+					 
+											string
+										startSearch
+										()
+									

+																

+					 
+											string
+										translate_path
+											(string $path)
+									

+																

+					 
+											string
+										updateSortOrder
+											( $order, string $sort_order)
+									

+																

+					 
+											string
+										whatToDo
+										()
+									

+																

+					 
+											void
+										_error
+											(string $text)
+									

+											

+		

+	
		
+
+	
+	

+		
Variables

+		

+			Description |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					

+		

+			
+
+

+
+	

+		
+		
+			array
+			$avail_tags
+						(line 80)
+		
+	

+
+	
+
list of available, not-selected, tags

+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			PHPFSPOT_CFG
+			$cfg
+						(line 41)
+		
+	

+
+	
+
phpfspot configuration

+	
    
+				
  • see: PHPFSPOT_CFG()
    • 
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			PHPFSPOT_DB
+			$cfg_db
+						(line 57)
+		
+	

+
+	
+
SQLite database handle to phpfspot database

+	
    
+				
  • see: PHPFSPOT_DB()
    • 
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			PHPFSPOT_DB
+			$db
+						(line 49)
+		
+	

+
+	
+
SQLite database handle to f-spot database

+	
    
+				
  • see: PHPFSPOT_DB()
    • 
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			array
+			$tags
+						(line 73)
+		
+	

+
+	
+
full tag - list

+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			PHPFSPOT_TMPL
+			$tmpl
+						(line 66)
+		
+	

+
+	
+
Smarty template engine

+	
+	
+	
+		
+		
+
+

+						
+		

+	

+	
+	
+	

+		
Methods

+		

+			Description |
+															Vars (details)
+														Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 103)
+	
 
+	
+	
+
class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)

+
this function will be called on class construct  and will check requirements, loads configuration,  open databases and start the user session

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		PHPFSPOT
+		
+			__construct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		Destructor __destruct (line 223)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			__destruct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		addTag (line 759)
+	
 
+	
+	
+
add tag to users session variable

+
this function will add the specified to users current  tag selection. if a date search has been made before  it will be now cleared

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			addTag
+		
+					( $tag)
+			

+	
+			
    
+					
  • 
+				
+				$tag			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		checkifImageSupported (line 1976)
+	
 
+	
+	
+
check if specified MIME type is supported

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		boolean
+		
+			checkifImageSupported
+		
+					(string $mime)
+			

+	
+			
    
+					
  • 
+				string
+				$mime			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		check_config_table (line 1515)
+	
 
+	
+	
+
create phpfspot own sqlite database

+
this function creates phpfspots own sqlite database  if it does not exist yet. this own is used to store  some necessary informations (md5 sum's, ...).

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			check_config_table
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		cleanup_phpfspot_db (line 2742)
+	
 
+	
+	
+
cleanup phpfspot own database

+
When photos are getting delete from F-Spot, there will remain  remain some residues in phpfspot own database. This function  will try to wipe them out.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			cleanup_phpfspot_db
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		create_thumbnail (line 1348)
+	
 
+	
+	
+
create_thumbnails for the requested width

+
this function creates image thumbnails of $orig_image  stored as $thumb_image. It will check if the image is  in a supported format, if necessary rotate the image  (based on EXIF orientation meta headers) and re-sizing.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		boolean
+		
+			create_thumbnail
+		
+					(string $orig_image, string $thumb_image, integer $width)
+			

+	
+			
    
+					
  • 
+				string
+				$orig_image			
    • 
+					
  • 
+				string
+				$thumb_image			
    • 
+					
  • 
+				integer
+				$width			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		delTag (line 783)
+	
 
+	
+	
+
remove tag to users session variable

+
this function removes the specified tag from  users current tag selection

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			delTag
+		
+					(string $tag)
+			

+	
+			
    
+					
  • 
+				string
+				$tag			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		gen_thumb (line 1543)
+	
 
+	
+	
+
Generates a thumbnail from photo idx

+
This function will generate JPEG thumbnails from provided F-Spot photo  indizes.
  1. Check if all thumbnail generations (width) are already in place and
+    readable
  2. Check if the md5sum of the original file has changed
  3. Generate the thumbnails if needed

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			gen_thumb
+		
+					([integer $idx = 0], [integer $force = 0], [boolean $overwrite = false])
+			

+	
+			
    
+					
  • 
+				integer
+				$idx			
    • 
+					
  • 
+				integer
+				$force			
    • 
+					
  • 
+				boolean
+				$overwrite			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		getAvailableTags (line 642)
+	
 
+	
+	
+
all available tags and tag cloud

+
this function outputs all available tags (time ordered)  and in addition output them as tag cloud (tags which have  many photos will appears more then others)

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			getAvailableTags
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getCurrentPhoto (line 2253)
+	
 
+	
+	
+
return the current photo

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			getCurrentPhoto
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getExport (line 2122)
+	
 
+	
+	
+
output export page

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			getExport
+		
+					(string $mode)
+			

+	
+			
    
+					
  • 
+				string
+				$mode			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		getFspotDBVersion (line 2613)
+	
 
+	
+	
+
retrive F-Spot database version

+
this function will return the F-Spot database version number  It is stored within the sqlite3 database in the table meta

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string|null
+		
+			getFspotDBVersion
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getMD5 (line 1627)
+	
 
+	
+	
+
returns stored md5 sum for a specific photo

+
this function queries the phpfspot database for a  stored MD5 checksum of the specified photo

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string|null
+		
+			getMD5
+		
+					(integer $idx)
+			

+	
+			
    
+					
  • 
+				integer
+				$idx			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		getNextSlideShowImage (line 2370)
+	
 
+	
+	
+
return the next to be shown slide show image

+
this function returns the URL of the next image  in the slideshow sequence.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			getNextSlideShowImage
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getPhotoName (line 451)
+	
 
+	
+	
+
returns aligned photo names

+
this function returns aligned (length) names for  an specific photo. If the length of the name exceeds  $limit the name will be shrinked (...)

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string|null
+		
+			getPhotoName
+		
+					(integer $idx, [integer $limit = 0])
+			

+	
+			
    
+					
  • 
+				integer
+				$idx			
    • 
+					
  • 
+				integer
+				$limit			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		getPhotoSelection (line 924)
+	
 
+	
+	
+
return all photo according selection

+
this function returns all photos based on  the tag-selection, tag- or date-search.  the tag-search also has to take care of AND  and OR conjunctions

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		array
+		
+			getPhotoSelection
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getPrevSlideShowImage (line 2390)
+	
 
+	
+	
+
return the previous to be shown slide show image

+
this function returns the URL of the previous image  in the slideshow sequence.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			getPrevSlideShowImage
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getRSSFeed (line 2164)
+	
 
+	
+	
+
output RSS feed

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			getRSSFeed
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		getSelectedTags (line 726)
+	
 
+	
+	
+
output all selected tags

+
this function output all tags which have been selected  by the user. the selected tags are stored in the  session-variable $_SESSION['selected_tags']

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			getSelectedTags
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		get_calendar_matrix (line 2043)
+	
 
+	
+	
+
output calendar matrix

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			get_calendar_matrix
+		
+					([integer $year = 0], [integer $month = 0], [integer $day = 0])
+			

+	
+			
    
+					
  • 
+				integer
+				$year			
    • 
+					
  • 
+				integer
+				$month			
    • 
+					
  • 
+				integer
+				$day			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		get_meta_informations (line 1502)
+	
 
+	
+	
+
return all exif meta data from the file

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		array
+		
+			get_meta_informations
+		
+					(string $file)
+			

+	
+			
    
+					
  • 
+				string
+				$file			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		get_num_photos (line 2542)
+	
 
+	
+	
+
returns the number of photos which are tagged with $tag_id

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		integer
+		
+			get_num_photos
+		
+					(integer $tag_id)
+			

+	
+			
    
+					
  • 
+				integer
+				$tag_id			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		get_photo_details (line 392)
+	
 
+	
+	
+
extract all photo details

+
retrieve all available details from f-spot's  database and return them as object

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		object|null
+		
+			get_photo_details
+		
+					(integer $idx)
+			

+	
+			
    
+					
  • 
+				integer
+				$idx			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		get_random_photo (line 2421)
+	
 
+	
+	
+
get random photo

+
this function will get all photos from the fspot  database and randomly return ONE entry
saddly there is yet no sqlite3 function which returns  the bulk result in array, so we have to fill up our  own here.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		array
+		
+			get_random_photo
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		get_thumb_path (line 2493)
+	
 
+	
+	
+
returns the full path to a thumbnail

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			get_thumb_path
+		
+					(integer $width, integer $photo)
+			

+	
+			
    
+					
  • 
+				integer
+				$width			
    • 
+					
  • 
+				integer
+				$photo			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		get_xml_tag_list (line 815)
+	
 
+	
+	
+
returns the value for the autocomplet tag-search

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			get_xml_tag_list
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		isValidDate (line 2447)
+	
 
+	
+	
+
validates provided date

+
this function validates if the provided date  contains a valid date and will return true  if it is.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		boolean
+		
+			isValidDate
+		
+					(string $date_str)
+			

+	
+			
    
+					
  • 
+				string
+				$date_str			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		parse_uri (line 2633)
+	
 
+	
+	
+
parse the provided URI and will returned the requested chunk

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			parse_uri
+		
+					(string $uri, string $mode)
+			

+	
+			
    
+					
  • 
+				string
+				$uri			
    • 
+					
  • 
+				string
+				$mode			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		resetDateSearch (line 906)
+	
 
+	
+	
+
reset date search

+
if any date search has taken place, reset  it now

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			resetDateSearch
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		resetNameSearch (line 893)
+	
 
+	
+	
+
reset name search

+
if any name search has taken place, reset it now

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			resetNameSearch
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		resetPhotoView (line 869)
+	
 
+	
+	
+
reset single photo

+
if a specific photo was requested (external link)  unset the session variable now

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			resetPhotoView
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		resetSlideShow (line 2403)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			resetSlideShow
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		resetTags (line 804)
+	
 
+	
+	
+
reset tag selection

+
if there is any tag selection, it will be  deleted now

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			resetTags
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		resetTagSearch (line 881)
+	
 
+	
+	
+
reset tag search

+
if any tag search has taken place, reset it now

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			resetTagSearch
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		setTagCondition (line 1665)
+	
 
+	
+	
+
store current tag condition

+
this function stores the current tag condition  (AND or OR) in the users session variables

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			setTagCondition
+		
+					(string $mode)
+			

+	
+			
    
+					
  • 
+				string
+				$mode			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		show (line 237)
+	
 
+	
+	
+
show - generate html output

+
this function can be called after the constructor has  prepared everyhing. it will load the index.tpl smarty  template. if necessary it will registere pre-selects  (photo index, photo, tag search, date search) into  users session.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			show
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		showCredits (line 1327)
+	
 
+	
+	
+
show credit template

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			showCredits
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		showPhoto (line 506)
+	
 
+	
+	
+
control HTML ouput for a single photo

+
this function provides all the necessary information  for the single photo template.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			showPhoto
+		
+					(integer $photo)
+			

+	
+			
    
+					
  • 
+				integer
+				$photo: photo			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		showPhotoIndex (line 1128)
+	
 
+	
+	
+
control HTML ouput for photo index

+
this function provides all the necessary information  for the photo index template.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			showPhotoIndex
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		showTextImage (line 1890)
+	
 
+	
+	
+
create on-the-fly images with text within

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			showTextImage
+		
+					(string $txt, [string $color = 000000], [integer $space = 4], [integer $font = 4], [integer $w = 300])
+			

+	
+			
    
+					
  • 
+				string
+				$txt			
    • 
+					
  • 
+				string
+				$color			
    • 
+					
  • 
+				integer
+				$space			
    • 
+					
  • 
+				integer
+				$font			
    • 
+					
  • 
+				integer
+				$w			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		smarty_sort_select_list (line 2308)
+	
 
+	
+	
+
returns a select-dropdown box to select photo index sort parameters

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			smarty_sort_select_list
+		
+					(array $params,  &$smarty, smarty $smarty)
+			

+	
+			
    
+					
  • 
+				array
+				$params			
    • 
+					
  • 
+				smarty
+				$smarty			
    • 
+					
  • 
+				
+				&$smarty			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		startSearch (line 1683)
+	
 
+	
+	
+
invoke tag & date search

+
this function will return all matching tags and store  them in the session variable selected_tags. furthermore  it also handles the date search.  getPhotoSelection() will then only return the matching  photos.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			startSearch
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		translate_path (line 493)
+	
 
+	
+	
+
translate f-spoth photo path

+
as the full-qualified path recorded in the f-spot database  is usally not the same as on the webserver, this function  will replace the path with that one specified in the cfg

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			translate_path
+		
+					(string $path)
+			

+	
+			
    
+					
  • 
+				string
+				$path			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		updateSortOrder (line 1735)
+	
 
+	
+	
+
updates sort order in session variable

+
this function is invoked by RPC and will sort the requested  sort order in the session variable.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			updateSortOrder
+		
+					( $order, string $sort_order)
+			

+	
+			
    
+					
  • 
+				string
+				$sort_order			
    • 
+					
  • 
+				
+				$order			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		whatToDo (line 2270)
+	
 
+	
+	
+
tells the client browser what to do

+
this function is getting called via AJAX by the  client browsers. it will tell them what they have  to do next. This is necessary for directly jumping  into photo index or single photo view when the are  requested with specific URLs

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		string
+		
+			whatToDo
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		_error (line 1989)
+	
 
+	
+	
+
output error text

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			_error
+		
+					(string $text)
+			

+	
+			
    
+					
  • 
+				string
+				$text			
    • 
+				

+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:57 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_CFG.html b/docs/phpfspot/PHPFSPOT_CFG.html
new file mode 100644
index 0000000..024b367
--- /dev/null
+++ b/docs/phpfspot/PHPFSPOT_CFG.html
@@ -0,0 +1,668 @@
+
+
+  
+		
+			
+			Docs For Class PHPFSPOT_CFG
+			
+			
+		
+		
+			
			
+
 Class PHPFSPOT_CFG

+
+
+

+	
Description

+	

+					Description |
+													Vars (details)
+						|											Methods (details)
+						
+					

+	

+        		
+		

+			Located in /phpfspot_cfg.php (line 3)
+		

+		
+				
+		

+	
+			

+

+
+
+
+	
+	

+		
Variable Summary

+		

+			Description |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								

+		

+			

+																																																																																																																																																																																																

+					 
+					mixed
+					$base_path
+				

+																

+					 
+					mixed
+					$db_access
+				

+																

+					 
+					mixed
+					$error_found
+				

+																

+					 
+					mixed
+					$fspot_db
+				

+																

+					 
+					mixed
+					$hide_tags
+				

+																

+					 
+					mixed
+					$logging
+				

+																

+					 
+					mixed
+					$log_file
+				

+																

+					 
+					mixed
+					$mini_width
+				

+																

+					 
+					mixed
+					$page_title
+				

+																

+					 
+					mixed
+					$path_replace_from
+				

+																

+					 
+					mixed
+					$path_replace_to
+				

+																

+					 
+					mixed
+					$photo_width
+				

+																

+					 
+					mixed
+					$phpfspot_db
+				

+																

+					 
+					mixed
+					$smarty_path
+				

+																

+					 
+					mixed
+					$theme_name
+				

+																

+					 
+					mixed
+					$thumbs_per_page
+				

+																

+					 
+					mixed
+					$thumb_height
+				

+																

+					 
+					mixed
+					$thumb_path
+				

+																

+					 
+					mixed
+					$thumb_width
+				

+																

+					 
+					mixed
+					$use_autocomplete
+				

+																

+					 
+					mixed
+					$use_lightbox
+				

+																

+					 
+					mixed
+					$web_path
+				

+											

+		

+	

+
+	
+	

+		
Method Summary

+		

+			Description |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		

+		
			
+			

+																								

+					 
+											PHPFSPOT_CFG
+										__construct
+										()
+									

+											

+		

+	
		
+
+	
+	

+		
Variables

+		

+			Description |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					

+		

+			
+
+

+
+	

+		
+		
+			mixed
+			$base_path
+			 =  "/var/www/beau.netshadow.at/htdocs"			(line 7)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$db_access
+			 =  "native"			(line 13)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$error_found
+			 =  0			(line 75)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$fspot_db
+			 =  "/var/www/beau.netshadow.at/fspot-data/photos.db"			(line 16)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$hide_tags
+			 = array("Favorites", "Hidden", "People", "Places", "Events")			(line 72)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$logging
+			 =  "display"			(line 64)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$log_file
+			 =  "phpfspot_err.log"			(line 67)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$mini_width
+			 =  "100"			(line 40)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$page_title
+			 =  "phpfspot - dynamic PHP gallery for F-Spot"			(line 5)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$path_replace_from
+			 =  "/home/unki/beau"			(line 50)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$path_replace_to
+			 =  "/var/www/beau.netshadow.at/fspot-data"			(line 51)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$photo_width
+			 =  "640"			(line 39)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$phpfspot_db
+			 =  "/var/www/beau.netshadow.at/fspot-data/phpfspot.db"			(line 21)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$smarty_path
+			 =  "/usr/share/php/smarty"			(line 33)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$theme_name
+			 =  "default"			(line 11)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$thumbs_per_page
+			 =  50			(line 44)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$thumb_height
+			 =  "145"			(line 38)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$thumb_path
+			 =  "/var/www/beau.netshadow.at/htdocs/thumbs"			(line 34)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$thumb_width
+			 =  "150"			(line 37)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$use_autocomplete
+			 =  true			(line 61)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$use_lightbox
+			 =  true			(line 56)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$web_path
+			 =  "/"			(line 9)
+		
+	

+
+	
+	
+	
+		
+		
+
+

+						
+		

+	

+	
+	
+	

+		
Methods

+		

+			Description |
+															Vars (details)
+														Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 77)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		PHPFSPOT_CFG
+		
+			__construct
+		
+				()
+			

+	
+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:05 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_DB.html b/docs/phpfspot/PHPFSPOT_DB.html
new file mode 100644
index 0000000..749fb63
--- /dev/null
+++ b/docs/phpfspot/PHPFSPOT_DB.html
@@ -0,0 +1,367 @@
+
+
+  
+		
+			
+			Docs For Class PHPFSPOT_DB
+			
+			
+		
+		
+			
			
+
 Class PHPFSPOT_DB

+
+
+

+	
Description

+	

+					Description |
+															Methods (details)
+						
+					

+	

+        		
+
PHPFSPOT_DB class

+		

+			Located in /phpfspot_db.php (line 29)
+		

+		
+				
+		

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																																																																

+					 
+											PHPFSPOT_DB
+										__construct
+											( $parent,  $db_path)
+									

+																

+					 
+											void
+										__destruct
+										()
+									

+																

+					 
+											true
+										db_check_table_exists
+											([string, $table_name = ""])
+									

+																

+					 
+											void
+										db_exec
+											([ $query = ""])
+									

+																

+					 
+											void
+										db_fetchSingleRow
+											([ $query = ""])
+									

+																

+					 
+											void
+										db_fetch_object
+											( $resource)
+									

+																

+					 
+											void
+										db_getNumRows
+											([ $query = ""])
+									

+																

+					 
+											void
+										db_query
+											([ $query = ""])
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 43)
+	
 
+	
+	
+
PHPFSPOT_DB class constructor

+
This constructor initially connect to the database.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		PHPFSPOT_DB
+		
+			__construct
+		
+					( $parent,  $db_path)
+			

+	
+			
    
+					
  • 
+				
+				$parent			
    • 
+					
  • 
+				
+				$db_path			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		Destructor __destruct (line 63)
+	
 
+	
+	
+
PHPFSPOT_DB class deconstructor

+
This destructor will close the current database connection.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			__destruct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		db_check_table_exists (line 253)
+	
 
+	
+	
+
PHPFSPOT_DB check table exists

+
This function checks if the given table exists in the  database

+	
    
+				
  • return: if table found otherwise false
    • 
+				
  • access: public
    • 
+			

+	
+	

+		true
+		
+			db_check_table_exists
+		
+					([string, $table_name = ""])
+			

+	
+			
    
+					
  • 
+				string,
+				$table_name: table name			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		db_exec (line 163)
+	
 
+	
+	
+
PHPFSPOT_DB database query & execute

+
This function will execute a SQL query and return nothing.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			db_exec
+		
+					([ $query = ""])
+			

+	
+			
    
+					
  • 
+				
+				$query			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		db_fetchSingleRow (line 206)
+	
 
+	
+	
+
PHPFSPOT_DB fetch ONE row

+
This function will execute the given but only return the  first result.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			db_fetchSingleRow
+		
+					([ $query = ""])
+			

+	
+			
    
+					
  • 
+				
+				$query			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		db_fetch_object (line 189)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			db_fetch_object
+		
+					( $resource)
+			

+	
+			
    
+					
  • 
+				
+				$resource			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		db_getNumRows (line 232)
+	
 
+	
+	
+
PHPFSPOT_DB number of affected rows

+
This functions returns the number of affected rows but the  given SQL query.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			db_getNumRows
+		
+					([ $query = ""])
+			

+	
+			
    
+					
  • 
+				
+				$query			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		db_query (line 127)
+	
 
+	
+	
+
PHPFSPOT_DB database query

+
This function will execute a SQL query and return the result as  object.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			db_query
+		
+					([ $query = ""])
+			

+	
+			
    
+					
  • 
+				
+				$query			
    • 
+				

+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_IMG.html b/docs/phpfspot/PHPFSPOT_IMG.html
new file mode 100644
index 0000000..8a566d0
--- /dev/null
+++ b/docs/phpfspot/PHPFSPOT_IMG.html
@@ -0,0 +1,177 @@
+
+
+  
+		
+			
+			Docs For Class PHPFSPOT_IMG
+			
+			
+		
+		
+			
			
+
 Class PHPFSPOT_IMG

+
+
+

+	
Description

+	

+					Description |
+															Methods (details)
+						
+					

+	

+        		
+
PHPFSPOT_IMG class

+
handles phpfspot's photos. It will output either the photo binaries  or can also show error messages as a on-the-fly generated picture.

+		

+			Located in /phpfspot_img.php (line 35)
+		

+		
+				
+		

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																								

+					 
+											PHPFSPOT_IMG
+										__construct
+										()
+									

+																

+					 
+											void
+										__destruct
+										()
+									

+																

+					 
+											void
+										show
+											(integer $idx, [integer $width = 0])
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 43)
+	
 
+	
+	
+
PHPFSPOT_IMG class constructor

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		PHPFSPOT_IMG
+		
+			__construct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		Destructor __destruct (line 53)
+	
 
+	
+	
+
PHPFSPOT_IMG class destructor

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			__destruct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		show (line 68)
+	
 
+	
+	
+
sends the specified image to the browser

+
this function will send the specified image to  the client - in the specified width. it also try's  to create on-the-fly missing thumbnails via PHPFSPOT  gen_thumbs function.

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			show
+		
+					(integer $idx, [integer $width = 0])
+			

+	
+			
    
+					
  • 
+				integer
+				$idx			
    • 
+					
  • 
+				integer
+				$width			
    • 
+				

+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_RPC.html b/docs/phpfspot/PHPFSPOT_RPC.html
new file mode 100644
index 0000000..f825903
--- /dev/null
+++ b/docs/phpfspot/PHPFSPOT_RPC.html
@@ -0,0 +1,136 @@
+
+
+  
+		
+			
+			Docs For Class PHPFSPOT_RPC
+			
+			
+		
+		
+			
			
+
 Class PHPFSPOT_RPC

+
+
+

+	
Description

+	

+					Description |
+															Methods (details)
+						
+					

+	

+        		
+
PHPFSPOT_RPC class

+
handles AJAX-RPC calls from client browsers

+		

+			Located in /rpc.php (line 33)
+		

+		
+				
+		

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																

+					 
+											PHPFSPOT_RPC
+										__construct
+										()
+									

+																

+					 
+											void
+										process_ajax_request
+										()
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 38)
+	
 
+	
+	
+
PHPFSPOT_RPC constructor

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		PHPFSPOT_RPC
+		
+			__construct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		process_ajax_request (line 45)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			process_ajax_request
+		
+				()
+			

+	
+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_TMPL.html b/docs/phpfspot/PHPFSPOT_TMPL.html
new file mode 100644
index 0000000..33f9597
--- /dev/null
+++ b/docs/phpfspot/PHPFSPOT_TMPL.html
@@ -0,0 +1,145 @@
+
+
+  
+		
+			
+			Docs For Class PHPFSPOT_TMPL
+			
+			
+		
+		
+			
			
+
 Class PHPFSPOT_TMPL

+
+
+

+	
Description

+	

+					Description |
+															Methods (details)
+						
+					

+	

+        		
+
PHPFSPOT_TMPL class

+
Extends Smarty base class with some additional functions

+		

+			Located in /phpfspot_tmpl.php (line 31)
+		

+		
+				
+		
Smarty
+   |
+   --PHPFSPOT_TMPL

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																

+					 
+											PHPFSPOT_TMPL
+										__construct
+										()
+									

+																

+					 
+											void
+										show
+											(string $template)
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 36)
+	
 
+	
+	
+
class constructor

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		PHPFSPOT_TMPL
+		
+			__construct
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		show (line 64)
+	
 
+	
+	
+
show template

+
outputs the requested template

+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			show
+		
+					(string $template)
+			

+	
+			
    
+					
  • 
+				string
+				$template			
    • 
+				

+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_find_dups.php.html b/docs/phpfspot/_find_dups.php.html
new file mode 100644
index 0000000..79b800a
--- /dev/null
+++ b/docs/phpfspot/_find_dups.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page find_dups.php
+			
+			
+		
+		
+			
			
+
File/find_dups.php

+
+
+

+	
Description

+	

+					Description |
+									Includes
+												

+	
	
+		
+		
+			

+

+		
+
+		
+	

+		
Includes

+		

+			Description |
+						Includes
+														

+		
	
+			
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot.class.php")
+			(line 31)
+		
+	

+
+	
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:49 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_gen_thumbs.php.html b/docs/phpfspot/_gen_thumbs.php.html
new file mode 100644
index 0000000..7d91cc2
--- /dev/null
+++ b/docs/phpfspot/_gen_thumbs.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page gen_thumbs.php
+			
+			
+		
+		
+			
			
+
File/gen_thumbs.php

+
+
+

+	
Description

+	

+					Description |
+									Includes
+												

+	
	
+		
+		
+			

+

+		
+
+		
+	

+		
Includes

+		

+			Description |
+						Includes
+														

+		
	
+			
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot.class.php")
+			(line 31)
+		
+	

+
+	
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:53 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_index.php.html b/docs/phpfspot/_index.php.html
new file mode 100644
index 0000000..f123f2e
--- /dev/null
+++ b/docs/phpfspot/_index.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page index.php
+			
+			
+		
+		
+			
			
+
File/index.php

+
+
+

+	
Description

+	

+					Description |
+									Includes
+												

+	
	
+		
+		
+			

+

+		
+
+		
+	

+		
Includes

+		

+			Description |
+						Includes
+														

+		
	
+			
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot.class.php")
+			(line 25)
+		
+	

+
+	
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:57 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot.class.php.html b/docs/phpfspot/_phpfspot.class.php.html
new file mode 100644
index 0000000..9ddd367
--- /dev/null
+++ b/docs/phpfspot/_phpfspot.class.php.html
@@ -0,0 +1,108 @@
+
+
+  
+		
+			
+			Docs for page phpfspot.class.php
+			
+			
+		
+		
+			
			
+
File/phpfspot.class.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+			|							Includes
+												

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+			|							Includes
+																		

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						PHPFSPOT
+					
+											PHPFSPOT main class
+										

+		

+	

+
+		
+	

+		
Includes

+		

+			Description |
+							Classes
+				|						Includes
+														

+		
	
+			
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot_cfg.php")
+			(line 25)
+		
+	

+
+	
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+	
+

+
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot_db.php")
+			(line 26)
+		
+	

+
+	
+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:57 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_cfg.php.html b/docs/phpfspot/_phpfspot_cfg.php.html
new file mode 100644
index 0000000..142d994
--- /dev/null
+++ b/docs/phpfspot/_phpfspot_cfg.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page phpfspot_cfg.php
+			
+			
+		
+		
+			
			
+
File/phpfspot_cfg.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+														

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+																	

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						PHPFSPOT_CFG
+					
+											
+										

+		

+	

+
+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:05 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_db.php.html b/docs/phpfspot/_phpfspot_db.php.html
new file mode 100644
index 0000000..2246e34
--- /dev/null
+++ b/docs/phpfspot/_phpfspot_db.php.html
@@ -0,0 +1,65 @@
+
+
+  
+		
+			
+			Docs for page phpfspot_db.php
+			
+			
+		
+		
+			
			
+
File/phpfspot_db.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+														

+	
	
+		
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+																	

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						PHPFSPOT_DB
+					
+											PHPFSPOT_DB class
+										

+		

+	

+
+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_img.php.html b/docs/phpfspot/_phpfspot_img.php.html
new file mode 100644
index 0000000..fe9e7d1
--- /dev/null
+++ b/docs/phpfspot/_phpfspot_img.php.html
@@ -0,0 +1,93 @@
+
+
+  
+		
+			
+			Docs for page phpfspot_img.php
+			
+			
+		
+		
+			
			
+
File/phpfspot_img.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+			|							Includes
+												

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+			|							Includes
+																		

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						PHPFSPOT_IMG
+					
+											PHPFSPOT_IMG class
+										

+		

+	

+
+		
+	

+		
Includes

+		

+			Description |
+							Classes
+				|						Includes
+														

+		
	
+			
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot.class.php")
+			(line 25)
+		
+	

+
+	
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_tmpl.php.html b/docs/phpfspot/_phpfspot_tmpl.php.html
new file mode 100644
index 0000000..70b3de9
--- /dev/null
+++ b/docs/phpfspot/_phpfspot_tmpl.php.html
@@ -0,0 +1,65 @@
+
+
+  
+		
+			
+			Docs for page phpfspot_tmpl.php
+			
+			
+		
+		
+			
			
+
File/phpfspot_tmpl.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+														

+	
	
+		
+
*************************************************************************

+
phpfspot, presents your F-Spot photo collection in Web browsers.
Copyright (c) by Andreas Unterkircher
This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*************************************************************************

+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+																	

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						PHPFSPOT_TMPL
+					
+											PHPFSPOT_TMPL class
+										

+		

+	

+
+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/phpfspot/_rpc.php.html b/docs/phpfspot/_rpc.php.html
new file mode 100644
index 0000000..943ba9d
--- /dev/null
+++ b/docs/phpfspot/_rpc.php.html
@@ -0,0 +1,91 @@
+
+
+  
+		
+			
+			Docs for page rpc.php
+			
+			
+		
+		
+			
			
+
File/rpc.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+			|							Includes
+												

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+			|							Includes
+																		

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						PHPFSPOT_RPC
+					
+											PHPFSPOT_RPC class
+										

+		

+	

+
+		
+	

+		
Includes

+		

+			Description |
+							Classes
+				|						Includes
+														

+		
	
+			
+

+	
+	

+		 
+		
+			require_once
+			("phpfspot.class.php")
+			(line 25)
+		
+	

+
+	
+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+	

+	

+
\ No newline at end of file
diff --git a/docs/ric_CHANGELOG.html b/docs/ric_CHANGELOG.html
new file mode 100644
index 0000000..3e1e35a
--- /dev/null
+++ b/docs/ric_CHANGELOG.html
@@ -0,0 +1,80 @@
+
+
+  
+		
+			
+			
+			
+			
+		
+		
+						
CHANGELOG

+
+phpfspot (1.4)
+
+  * feature, support PNG image format.
+  * feature, auto-completion for tag-search.
+  * feature, lightbox2 for photo preview out of the photo index.
+  * feature, a bit more color for tag-cloud.
+  * bug, SQlite temporary directory can now be set in phpfspot_cfg.php
+  * bug, modify AJAX-loading notification. Standard HTML_AJAX is getting overlayed.
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Sat, 29 Mar 2008 11:00:00 +0100
+
+phpfspot (1.3)
+
+  * bug, fixed auto-rotation when EXIF Orientation header is set.
+  * bug, fixed incorrect time-range when using external-url to enter phpfspot.
+  * bug, display also photos which have no tags.
+  * bug, sometimes photos where displayed several times.
+  * bug, fixed image handling which were slender enough, but too high.
+  * bug, fix for PDO sqlite when trying to fetch one single row (contributed by
+  * bug, fix for incorrect SQL query (contributed by Arun Persaud).
+  * bug, fixed window-movement when switching between photo index & photo
+  * feature, removed much of HTML tables to speed up GUI & CSS cleanup
+  * feature, key navigation (next/prev photo, photo index, reset all).
+  * feature, gen_thumbs.php has a new overwrite-thumbnails option.
+  * feature, max. thumb height can now be changed in config settings.
+    Arun Persaud).
+  * feature, new sort order which will group photos by tag-names (alphabetical).
+  * feature, simplified config file by moving config-check out to the main class file.
+  * feature, script to search for duplicated photos via comparing MD5 hash sums.
+  * feature, search for filename's and through photo descriptions.
+  * feature, zooming
+  * feature, new icon's from the Nuovo icon set.
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Sat, 12 Jan 2008 11:00:00 +0100
+
+phpfspot (1.2)
+
+  * Show only user-definied tags and pictures (contributed by Arun Persaud).
+  * handling introduced database layout of F-Spot 0.4.x
+  * cleaning up code to avoid PHP warning messages on E_ALL
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Fri, 30 Dec 2007 20:03:38 +0100
+
+phpfspot (1.1)
+
+  * new thumbnail directory strcuture inspired by GIT's directory structure
+    (contributed by Arun Persaud).
+  * support for RSS feed (v2.0)
+  * support for PHP5's PDO (PHP Data Objects) to access sqlite3 database
+    (contributed by Arun Persaud).
+  * additional configurable options
+    - Path to smarty
+    - Path to store thumbnails
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Fri, 09 Nov 2007 18:41:00 +0100
+
+phpfspot (1.0)
+
+  * first major release
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Sat, 18 Aug 2007 16:36:00 +0200
+
+

+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:41 +0200 by phpDocumentor 1.4.2
+	

+	
+
\ No newline at end of file
diff --git a/docs/ric_INSTALL.html b/docs/ric_INSTALL.html
new file mode 100644
index 0000000..d241378
--- /dev/null
+++ b/docs/ric_INSTALL.html
@@ -0,0 +1,62 @@
+
+
+  
+		
+			
+			
+			
+			
+		
+		
+						
INSTALL

+
+phpfspot install howto:
+
+* requirements
+ 
+ - apache/apache2 (in fact any webserver which supports php)
+ - php5
+   - the following extensions must be available
+     (compiled in or as shared object):
+     * gd
+     * sqlite3 (native or as PDO driver)
+   - PEAR extensions (pear install %name%)
+     * Calendar
+     * HTML_AJAX
+ - Smarty (php template engine, http://smarty.php.net)
+ - sqlite3
+  
+* installation
+
+ 1. copy the sample phpfspot-config-file to your new config file
+
+    cp phpfspot_cfg.php.dist phpfspot_cfg.php
+
+ 2. Edit phpfspot_cfg.php and edit the necessary configuration
+    parameters. This file also include explanation of each option.
+    Take care that the path to the f-spot database (photos.db)
+    and the f-spot photo base directory (usally Photos) is set
+    correctly.
+
+ 3. Open phpfspot in our favourite browser. The URL depends what
+    you have specify as $webpath in the configuration var. But
+    usually it will be http://myserver/phpfspot (where myserver
+    is your webservers IP, server name, virtual host name, ...).
+
+ 4. To pre-create all thumbnails invoke the script gen_thumbs.php
+
+    cd ${phpfspot_home}
+    "./gen_thumbs.php"
+    or 
+    "php gen_thumbs.php" (if execute-permission is not set)
+
+    thumbnails can also be created on-the-fly by the webserver but
+    this will take away a lot of resources of your system during
+    thumb-generation. pre-creation on the shell works faster.
+
+

+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:40 +0200 by phpDocumentor 1.4.2
+	

+	
+
\ No newline at end of file
diff --git a/docs/ric_README.html b/docs/ric_README.html
new file mode 100644
index 0000000..2578177
--- /dev/null
+++ b/docs/ric_README.html
@@ -0,0 +1,24 @@
+
+
+  
+		
+			
+			
+			
+			
+		
+		
+						
README

+
+Package Name: phpfspot
+Version:      1.4
+Author:       Andreas Unterkircher <unki@netshadow.at>
+Website:      http://oss.netshadow.at
+Desc:         dynamic PHP gallery for F-Spot
+
+

+	

+		Documentation generated on Sat, 12 Apr 2008 18:24:41 +0200 by phpDocumentor 1.4.2
+	

+	
+
\ No newline at end of file
-- 
cgit v1.2.3-18-g5258


From 55677896eb839e20542440e51c5737a318240dab Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher 
Date: Sat, 12 Apr 2008 18:40:20 +0200
Subject: update documentation

Signed-off-by: Andreas Unterkircher 
---
 docs/classtrees_phpfspot.html          |   6 +-
 docs/elementindex.html                 | 263 +------------
 docs/elementindex_phpfspot.html        | 263 +------------
 docs/errors.html                       |  27 +-
 docs/index.html                        |   2 +-
 docs/li_phpfspot.html                  |   2 -
 docs/phpfspot/PHPFSPOT.html            | 115 +++---
 docs/phpfspot/PHPFSPOT_CFG.html        | 668 ---------------------------------
 docs/phpfspot/PHPFSPOT_DB.html         |  36 +-
 docs/phpfspot/PHPFSPOT_IMG.html        |  16 +-
 docs/phpfspot/PHPFSPOT_RPC.html        |   6 +-
 docs/phpfspot/PHPFSPOT_TMPL.html       |  12 +-
 docs/phpfspot/_find_dups.php.html      |  10 +-
 docs/phpfspot/_gen_thumbs.php.html     |  10 +-
 docs/phpfspot/_index.php.html          |   9 +-
 docs/phpfspot/_phpfspot.class.php.html |   4 +-
 docs/phpfspot/_phpfspot_cfg.php.html   |  63 ----
 docs/phpfspot/_phpfspot_db.php.html    |   2 +-
 docs/phpfspot/_phpfspot_img.php.html   |   4 +-
 docs/phpfspot/_phpfspot_tmpl.php.html  |   2 +-
 docs/phpfspot/_rpc.php.html            |   4 +-
 docs/ric_CHANGELOG.html                |   2 +-
 docs/ric_INSTALL.html                  |   2 +-
 docs/ric_README.html                   |   2 +-
 find_dups.php                          |   7 +
 gen_docs.sh                            |   2 +-
 gen_thumbs.php                         |   8 +
 index.php                              |   5 +
 phpfspot.class.php                     |   5 +-
 phpfspot_db.php                        |   1 +
 phpfspot_img.php                       |   1 -
 31 files changed, 200 insertions(+), 1359 deletions(-)
 delete mode 100644 docs/phpfspot/PHPFSPOT_CFG.html
 delete mode 100644 docs/phpfspot/_phpfspot_cfg.php.html

diff --git a/docs/classtrees_phpfspot.html b/docs/classtrees_phpfspot.html
index 6ee5ce4..9879e41 100644
--- a/docs/classtrees_phpfspot.html
+++ b/docs/classtrees_phpfspot.html
@@ -17,10 +17,6 @@
 
 
-
Root class PHPFSPOT_CFG

-
-
 
Root class PHPFSPOT_DB

 
@@ -38,7 +34,7 @@
 
  • PHPFSPOT_TMPL
    • 
 
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:48 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:22 +0200 by phpDocumentor 1.4.2
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/elementindex.html b/docs/elementindex.html
index 15acbc4..1d92707 100644
--- a/docs/elementindex.html
+++ b/docs/elementindex.html
@@ -17,16 +17,11 @@
 
    
 
    
 	a
-	b
 	c
 	d
-	e
 	f
 	g
-	h
 	i
-	l
-	m
 	p
 	r
 	s
@@ -60,21 +55,6 @@
 							
    add tag to users session variable
    
 					
 		
-	
-	
    
-		
    b
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$base_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$base_path in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    c
    
@@ -146,13 +126,6 @@
 			
    PHPFSPOT::$db in phpfspot.class.php
    
 							
    SQLite database handle to f-spot database
    
 					
-			
    
-						Variable
-			$db_access
-					
    
-		
    
-			
    PHPFSPOT_CFG::$db_access in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			db_check_table_exists
@@ -209,21 +182,6 @@
 							
    remove tag to users session variable
    
 					
 		
-	
-	
    
-		
    e
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$error_found
-					
    
-		
    
-			
    PHPFSPOT_CFG::$error_found in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    f
    
@@ -231,13 +189,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$fspot_db
-					
    
-		
    
-			
    PHPFSPOT_CFG::$fspot_db in phpfspot_cfg.php
    
-					
    
 			
    
 						Page
 			find_dups.php
@@ -413,21 +364,6 @@
 							
    returns the value for the autocomplet tag-search
    
 					
 		
    
-	
-	
    
-		
    h
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$hide_tags
-					
    
-		
    
-			
    PHPFSPOT_CFG::$hide_tags in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    i
    
@@ -451,43 +387,6 @@
 							
    validates provided date
    
 					
 		
-	
-	
    
-		
    l
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$logging
-					
    
-		
    
-			
    PHPFSPOT_CFG::$logging in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$log_file
-					
    
-		
    
-			
    PHPFSPOT_CFG::$log_file in phpfspot_cfg.php
    
-					
    
-		
    
-	
-	
    
-		
    m
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$mini_width
-					
    
-		
    
-			
    PHPFSPOT_CFG::$mini_width in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    p
    
@@ -495,41 +394,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$page_title
-					
    
-		
    
-			
    PHPFSPOT_CFG::$page_title in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$path_replace_from
-					
    
-		
    
-			
    PHPFSPOT_CFG::$path_replace_from in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$path_replace_to
-					
    
-		
    
-			
    PHPFSPOT_CFG::$path_replace_to in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$photo_width
-					
    
-		
    
-			
    PHPFSPOT_CFG::$photo_width in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$phpfspot_db
-					
    
-		
    
-			
    PHPFSPOT_CFG::$phpfspot_db in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			parse_uri
@@ -555,20 +419,6 @@
 					
 			
    
 						Class
-			PHPFSPOT_CFG
-					
    
-		
    
-			
    PHPFSPOT_CFG in phpfspot_cfg.php
    
-					
    
-			
    
-						Page
-			phpfspot_cfg.php
-					
    
-		
    
-			
    phpfspot_cfg.php in phpfspot_cfg.php
    
-					
    
-			
    
-						Class
 			PHPFSPOT_DB
 					
    
 		
    
@@ -697,13 +547,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$smarty_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$smarty_path in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			setTagCondition
@@ -717,24 +560,24 @@
 			show
 					
    
 		
    
-			
    PHPFSPOT_IMG::show() in phpfspot_img.php
    
-							
    sends the specified image to the browser
    
+			
    PHPFSPOT_TMPL::show() in phpfspot_tmpl.php
    
+							
    show template
    
 					
    
 			
    
 						Method
 			show
 					
    
 		
    
-			
    PHPFSPOT_TMPL::show() in phpfspot_tmpl.php
    
-							
    show template
    
+			
    PHPFSPOT::show() in phpfspot.class.php
    
+							
    show - generate html output
    
 					
    
 			
    
 						Method
 			show
 					
    
 		
    
-			
    PHPFSPOT::show() in phpfspot.class.php
    
-							
    show - generate html output
    
+			
    PHPFSPOT_IMG::show() in phpfspot_img.php
    
+							
    sends the specified image to the browser
    
 					
    
 			
    
 						Method
@@ -802,41 +645,6 @@
 					
 			
    
 						Variable
-			$theme_name
-					
    
-		
    
-			
    PHPFSPOT_CFG::$theme_name in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumbs_per_page
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumbs_per_page in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumb_height
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumb_height in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumb_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumb_path in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumb_width
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumb_width in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
 			$tmpl
 					
    
 		
    
@@ -859,20 +667,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$use_autocomplete
-					
    
-		
    
-			
    PHPFSPOT_CFG::$use_autocomplete in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$use_lightbox
-					
    
-		
    
-			
    PHPFSPOT_CFG::$use_lightbox in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			updateSortOrder
@@ -889,13 +683,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$web_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$web_path in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			whatToDo
@@ -925,24 +712,16 @@
 			__construct
 					
    
 		
    
-			
    PHPFSPOT_TMPL::__construct() in phpfspot_tmpl.php
    
-							
    class constructor
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    PHPFSPOT_RPC::__construct() in rpc.php
    
-							
    PHPFSPOT_RPC constructor
    
+			
    PHPFSPOT_IMG::__construct() in phpfspot_img.php
    
+							
    PHPFSPOT_IMG class constructor
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    PHPFSPOT_IMG::__construct() in phpfspot_img.php
    
-							
    PHPFSPOT_IMG class constructor
    
+			
    PHPFSPOT::__construct() in phpfspot.class.php
    
+							
    class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
    
 					
    
 			
    
 						Method
@@ -957,53 +736,49 @@
 			__construct
 					
    
 		
    
-			
    PHPFSPOT_CFG::__construct() in phpfspot_cfg.php
    
+			
    PHPFSPOT_TMPL::__construct() in phpfspot_tmpl.php
    
+							
    PHPFSPOT_TMPL constructor
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    PHPFSPOT::__construct() in phpfspot.class.php
    
-							
    class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
    
+			
    PHPFSPOT_RPC::__construct() in rpc.php
    
+							
    PHPFSPOT_RPC constructor
    
 					
    
 			
    
 						Method
 			__destruct
 					
    
 		
    
-			
    PHPFSPOT::__destruct() in phpfspot.class.php
    
+			
    PHPFSPOT_DB::__destruct() in phpfspot_db.php
    
+							
    PHPFSPOT_DB class deconstructor
    
 					
    
 			
    
 						Method
 			__destruct
 					
    
 		
    
-			
    PHPFSPOT_IMG::__destruct() in phpfspot_img.php
    
-							
    PHPFSPOT_IMG class destructor
    
+			
    PHPFSPOT::__destruct() in phpfspot.class.php
    
 					
    
 			
    
 						Method
 			__destruct
 					
    
 		
    
-			
    PHPFSPOT_DB::__destruct() in phpfspot_db.php
    
-							
    PHPFSPOT_DB class deconstructor
    
+			
    PHPFSPOT_IMG::__destruct() in phpfspot_img.php
    
+							
    PHPFSPOT_IMG class destructor
    
 					
    
 		
    
 
 
    
 	a
-	b
 	c
 	d
-	e
 	f
 	g
-	h
 	i
-	l
-	m
 	p
 	r
 	s
diff --git a/docs/elementindex_phpfspot.html b/docs/elementindex_phpfspot.html
index 51cc660..8138e3a 100644
--- a/docs/elementindex_phpfspot.html
+++ b/docs/elementindex_phpfspot.html
@@ -14,16 +14,11 @@
 
    
 
    
 	a
-	b
 	c
 	d
-	e
 	f
 	g
-	h
 	i
-	l
-	m
 	p
 	r
 	s
@@ -53,24 +48,16 @@
 			__construct
 					
 		
    
-			
    PHPFSPOT_TMPL::__construct() in phpfspot_tmpl.php
    
-							
    class constructor
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    PHPFSPOT_RPC::__construct() in rpc.php
    
-							
    PHPFSPOT_RPC constructor
    
+			
    PHPFSPOT_IMG::__construct() in phpfspot_img.php
    
+							
    PHPFSPOT_IMG class constructor
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    PHPFSPOT_IMG::__construct() in phpfspot_img.php
    
-							
    PHPFSPOT_IMG class constructor
    
+			
    PHPFSPOT::__construct() in phpfspot.class.php
    
+							
    class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
    
 					
    
 			
    
 						Method
@@ -85,38 +72,39 @@
 			__construct
 					
    
 		
    
-			
    PHPFSPOT_CFG::__construct() in phpfspot_cfg.php
    
+			
    PHPFSPOT_TMPL::__construct() in phpfspot_tmpl.php
    
+							
    PHPFSPOT_TMPL constructor
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    PHPFSPOT::__construct() in phpfspot.class.php
    
-							
    class constructor ($cfg, $db, $cfg_db, $tmpl, $db_ver)
    
+			
    PHPFSPOT_RPC::__construct() in rpc.php
    
+							
    PHPFSPOT_RPC constructor
    
 					
    
 			
    
 						Method
 			__destruct
 					
    
 		
    
-			
    PHPFSPOT::__destruct() in phpfspot.class.php
    
+			
    PHPFSPOT_DB::__destruct() in phpfspot_db.php
    
+							
    PHPFSPOT_DB class deconstructor
    
 					
    
 			
    
 						Method
 			__destruct
 					
    
 		
    
-			
    PHPFSPOT_IMG::__destruct() in phpfspot_img.php
    
-							
    PHPFSPOT_IMG class destructor
    
+			
    PHPFSPOT::__destruct() in phpfspot.class.php
    
 					
    
 			
    
 						Method
 			__destruct
 					
    
 		
    
-			
    PHPFSPOT_DB::__destruct() in phpfspot_db.php
    
-							
    PHPFSPOT_DB class deconstructor
    
+			
    PHPFSPOT_IMG::__destruct() in phpfspot_img.php
    
+							
    PHPFSPOT_IMG class destructor
    
 					
    
 		
 	
@@ -143,21 +131,6 @@
 							
    add tag to users session variable
    
 					
 		
-	
-	
    
-		
    b
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$base_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$base_path in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    c
    
@@ -229,13 +202,6 @@
 			
    PHPFSPOT::$db in phpfspot.class.php
    
 							
    SQLite database handle to f-spot database
    
 					
-			
    
-						Variable
-			$db_access
-					
    
-		
    
-			
    PHPFSPOT_CFG::$db_access in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			db_check_table_exists
@@ -292,21 +258,6 @@
 							
    remove tag to users session variable
    
 					
 		
-	
-	
    
-		
    e
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$error_found
-					
    
-		
    
-			
    PHPFSPOT_CFG::$error_found in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    f
    
@@ -314,13 +265,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$fspot_db
-					
    
-		
    
-			
    PHPFSPOT_CFG::$fspot_db in phpfspot_cfg.php
    
-					
    
 			
    
 						Page
 			find_dups.php
@@ -496,21 +440,6 @@
 							
    returns the value for the autocomplet tag-search
    
 					
 		
    
-	
-	
    
-		
    h
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$hide_tags
-					
    
-		
    
-			
    PHPFSPOT_CFG::$hide_tags in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    i
    
@@ -534,43 +463,6 @@
 							
    validates provided date
    
 					
 		
-	
-	
    
-		
    l
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$logging
-					
    
-		
    
-			
    PHPFSPOT_CFG::$logging in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$log_file
-					
    
-		
    
-			
    PHPFSPOT_CFG::$log_file in phpfspot_cfg.php
    
-					
    
-		
    
-	
-	
    
-		
    m
    
-		
-		
    
-	
    
-	
    
-			
    
-						Variable
-			$mini_width
-					
    
-		
    
-			
    PHPFSPOT_CFG::$mini_width in phpfspot_cfg.php
    
-					
    
-		
    
 	
 	
    
 		
    p
    
@@ -578,41 +470,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$page_title
-					
    
-		
    
-			
    PHPFSPOT_CFG::$page_title in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$path_replace_from
-					
    
-		
    
-			
    PHPFSPOT_CFG::$path_replace_from in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$path_replace_to
-					
    
-		
    
-			
    PHPFSPOT_CFG::$path_replace_to in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$photo_width
-					
    
-		
    
-			
    PHPFSPOT_CFG::$photo_width in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$phpfspot_db
-					
    
-		
    
-			
    PHPFSPOT_CFG::$phpfspot_db in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			parse_uri
@@ -638,20 +495,6 @@
 					
 			
    
 						Class
-			PHPFSPOT_CFG
-					
    
-		
    
-			
    PHPFSPOT_CFG in phpfspot_cfg.php
    
-					
    
-			
    
-						Page
-			phpfspot_cfg.php
-					
    
-		
    
-			
    phpfspot_cfg.php in phpfspot_cfg.php
    
-					
    
-			
    
-						Class
 			PHPFSPOT_DB
 					
    
 		
    
@@ -780,13 +623,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$smarty_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$smarty_path in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			setTagCondition
@@ -800,24 +636,24 @@
 			show
 					
    
 		
    
-			
    PHPFSPOT_IMG::show() in phpfspot_img.php
    
-							
    sends the specified image to the browser
    
+			
    PHPFSPOT_TMPL::show() in phpfspot_tmpl.php
    
+							
    show template
    
 					
    
 			
    
 						Method
 			show
 					
    
 		
    
-			
    PHPFSPOT_TMPL::show() in phpfspot_tmpl.php
    
-							
    show template
    
+			
    PHPFSPOT::show() in phpfspot.class.php
    
+							
    show - generate html output
    
 					
    
 			
    
 						Method
 			show
 					
    
 		
    
-			
    PHPFSPOT::show() in phpfspot.class.php
    
-							
    show - generate html output
    
+			
    PHPFSPOT_IMG::show() in phpfspot_img.php
    
+							
    sends the specified image to the browser
    
 					
    
 			
    
 						Method
@@ -885,41 +721,6 @@
 					
 			
    
 						Variable
-			$theme_name
-					
    
-		
    
-			
    PHPFSPOT_CFG::$theme_name in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumbs_per_page
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumbs_per_page in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumb_height
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumb_height in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumb_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumb_path in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$thumb_width
-					
    
-		
    
-			
    PHPFSPOT_CFG::$thumb_width in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
 			$tmpl
 					
    
 		
    
@@ -942,20 +743,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$use_autocomplete
-					
    
-		
    
-			
    PHPFSPOT_CFG::$use_autocomplete in phpfspot_cfg.php
    
-					
    
-			
    
-						Variable
-			$use_lightbox
-					
    
-		
    
-			
    PHPFSPOT_CFG::$use_lightbox in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			updateSortOrder
@@ -972,13 +759,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$web_path
-					
    
-		
    
-			
    PHPFSPOT_CFG::$web_path in phpfspot_cfg.php
    
-					
    
 			
    
 						Method
 			whatToDo
@@ -991,16 +771,11 @@
 
 
    
 	a
-	b
 	c
 	d
-	e
 	f
 	g
-	h
 	i
-	l
-	m
 	p
 	r
 	s
diff --git a/docs/errors.html b/docs/errors.html
index 16075cd..4440377 100644
--- a/docs/errors.html
+++ b/docs/errors.html
@@ -12,7 +12,6 @@
 gen_thumbs.php
    
 index.php
    
 phpfspot.class.php
    
-phpfspot_cfg.php
    
 phpfspot_db.php
    
 phpfspot_img.php
    
 phpfspot_tmpl.php
    
@@ -24,33 +23,33 @@
 
 
    find_dups.php
    
 
    Warnings:

    
-Warning on line 56 - File "/var/www/beau.netshadow.at/htdocs/find_dups.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 32 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/find_dups.php
    
+
    Errors:

    
+Error on line 37 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package phpfspot"
    
 
 
    gen_thumbs.php
    
 
    Warnings:

    
-Warning on line 90 - File "/var/www/beau.netshadow.at/htdocs/gen_thumbs.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 33 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/gen_thumbs.php
    
+
    Errors:

    
+Error on line 38 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package phpfspot"
    
 
 
    index.php
    
 
    Warnings:

    
-Warning on line 29 - File "/var/www/beau.netshadow.at/htdocs/index.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 29 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/index.php
    
+
    Errors:

    
+Error on line 29 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package phpfspot"
    
 
 
    phpfspot.class.php
    
 
    Warnings:

    
-Warning on line 2567 - Unknown tag "@retrun" used
    
-Warning on line 2796 - File "/var/www/beau.netshadow.at/htdocs/phpfspot.class.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
-
-
    phpfspot_cfg.php
    
-
    Warnings:

    
-Warning on line 2 - no @package tag was used in a DocBlock for class PHPFSPOT_CFG
    
-Warning on line 83 - File "/var/www/beau.netshadow.at/htdocs/phpfspot_cfg.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 2799 - File "/var/www/beau.netshadow.at/htdocs/phpfspot.class.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    phpfspot_db.php
    
 
    Warnings:

    
-Warning on line 28 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/phpfspot_db.php
    
+Warning on line 29 - no @package tag was used in a DocBlock for file /var/www/beau.netshadow.at/htdocs/phpfspot_db.php
    
 
 
    phpfspot_img.php
    
 
    Warnings:

    
-Warning on line 142 - File "/var/www/beau.netshadow.at/htdocs/phpfspot_img.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 141 - File "/var/www/beau.netshadow.at/htdocs/phpfspot_img.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    phpfspot_tmpl.php
    
 
    Warnings:

    
@@ -60,7 +59,7 @@
 
    Warnings:

    
 Warning on line 178 - File "/var/www/beau.netshadow.at/htdocs/rpc.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:55 +0200 by phpDocumentor 1.4.2
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index ac623fd..e69c63b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4,7 +4,7 @@
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    
 
-	
+	
   phpfspot source-code documentation
   
 
diff --git a/docs/li_phpfspot.html b/docs/li_phpfspot.html
index 9173f8f..75ee937 100644
--- a/docs/li_phpfspot.html
+++ b/docs/li_phpfspot.html
@@ -23,7 +23,6 @@
 							
 																	
     Classes
    
 										    						    
    ClassPHPFSPOT
    
-					    										    						    
    ClassPHPFSPOT_CFG
    
 					    										    						    
    ClassPHPFSPOT_DB
    
 					    										    						    
    ClassPHPFSPOT_IMG
    
 					    										    						    
    ClassPHPFSPOT_RPC
    
@@ -33,7 +32,6 @@
 											
    Filegen_thumbs.php
    
 											
    Fileindex.php
    
 											
    Filephpfspot.class.php
    
-											
    Filephpfspot_cfg.php
    
 											
    Filephpfspot_db.php
    
 											
    Filephpfspot_img.php
    
 											
    Filephpfspot_tmpl.php
    
diff --git a/docs/phpfspot/PHPFSPOT.html b/docs/phpfspot/PHPFSPOT.html
index 62e0947..33c8cb5 100644
--- a/docs/phpfspot/PHPFSPOT.html
+++ b/docs/phpfspot/PHPFSPOT.html
@@ -26,8 +26,9 @@
 	
    
         		
 
    PHPFSPOT main class
    
+
    this class contains the most functions which will to the major  work for phpfspot.
    
 		
    
-			Located in /phpfspot.class.php (line 33)
+			Located in /phpfspot.class.php (line 36)
 		
    
 		
 				
@@ -57,7 +58,7 @@
 				
    
 																
    
 					 
-					PHPFSPOT_CFG
+					PHPFSPOT_CFG
 					$cfg
 				
    
 																
    
@@ -404,7 +405,7 @@
 		
 			array
 			$avail_tags
-						(line 80)
+						(line 83)
 		
 	
    
 
@@ -425,9 +426,9 @@
 	
    
 		
 		
-			PHPFSPOT_CFG
+			PHPFSPOT_CFG
 			$cfg
-						(line 41)
+						(line 44)
 		
 	
    
 
@@ -451,7 +452,7 @@
 		
 			PHPFSPOT_DB
 			$cfg_db
-						(line 57)
+						(line 60)
 		
 	
    
 
@@ -475,7 +476,7 @@
 		
 			PHPFSPOT_DB
 			$db
-						(line 49)
+						(line 52)
 		
 	
 
@@ -499,7 +500,7 @@
 		
 			array
 			$tags
-						(line 73)
+						(line 76)
 		
 	
 
@@ -522,7 +523,7 @@
 		
 			PHPFSPOT_TMPL
 			$tmpl
-						(line 66)
+						(line 69)
 		
 	
 
@@ -559,7 +560,7 @@
 	
 	
    
 		
-		Constructor __construct (line 103)
+		Constructor __construct (line 106)
 	
     
 	
 	
@@ -585,7 +586,7 @@
 	
 	
    
 		
-		Destructor __destruct (line 223)
+		Destructor __destruct (line 226)
 	
     
 	
 	
@@ -609,7 +610,7 @@
 	
 	
    
 		
-		addTag (line 759)
+		addTag (line 762)
 	
     
 	
 	
@@ -640,7 +641,7 @@
 	
 	
    
 		
-		checkifImageSupported (line 1976)
+		checkifImageSupported (line 1979)
 	
     
 	
 	
@@ -670,7 +671,7 @@
 	
 	
    
 		
-		check_config_table (line 1515)
+		check_config_table (line 1518)
 	
     
 	
 	
@@ -696,7 +697,7 @@
 	
 	
    
 		
-		cleanup_phpfspot_db (line 2742)
+		cleanup_phpfspot_db (line 2745)
 	
     
 	
 	
@@ -722,7 +723,7 @@
 	
 	
    
 		
-		create_thumbnail (line 1348)
+		create_thumbnail (line 1351)
 	
     
 	
 	
@@ -759,7 +760,7 @@
 	
 	
    
 		
-		delTag (line 783)
+		delTag (line 786)
 	
     
 	
 	
@@ -790,7 +791,7 @@
 	
 	
    
 		
-		gen_thumb (line 1543)
+		gen_thumb (line 1546)
 	
     
 	
 	
@@ -828,7 +829,7 @@
 	
 	
    
 		
-		getAvailableTags (line 642)
+		getAvailableTags (line 645)
 	
     
 	
 	
@@ -854,7 +855,7 @@
 	
 	
    
 		
-		getCurrentPhoto (line 2253)
+		getCurrentPhoto (line 2256)
 	
     
 	
 	
@@ -879,7 +880,7 @@
 	
 	
    
 		
-		getExport (line 2122)
+		getExport (line 2125)
 	
     
 	
 	
@@ -909,7 +910,7 @@
 	
 	
    
 		
-		getFspotDBVersion (line 2613)
+		getFspotDBVersion (line 2616)
 	
     
 	
 	
@@ -935,7 +936,7 @@
 	
 	
    
 		
-		getMD5 (line 1627)
+		getMD5 (line 1630)
 	
     
 	
 	
@@ -966,7 +967,7 @@
 	
 	
    
 		
-		getNextSlideShowImage (line 2370)
+		getNextSlideShowImage (line 2373)
 	
     
 	
 	
@@ -992,7 +993,7 @@
 	
 	
    
 		
-		getPhotoName (line 451)
+		getPhotoName (line 454)
 	
     
 	
 	
@@ -1026,7 +1027,7 @@
 	
 	
    
 		
-		getPhotoSelection (line 924)
+		getPhotoSelection (line 927)
 	
     
 	
 	
@@ -1052,7 +1053,7 @@
 	
 	
    
 		
-		getPrevSlideShowImage (line 2390)
+		getPrevSlideShowImage (line 2393)
 	
     
 	
 	
@@ -1078,7 +1079,7 @@
 	
 	
    
 		
-		getRSSFeed (line 2164)
+		getRSSFeed (line 2167)
 	
     
 	
 	
@@ -1103,7 +1104,7 @@
 	
 	
    
 		
-		getSelectedTags (line 726)
+		getSelectedTags (line 729)
 	
     
 	
 	
@@ -1129,7 +1130,7 @@
 	
 	
    
 		
-		get_calendar_matrix (line 2043)
+		get_calendar_matrix (line 2046)
 	
     
 	
 	
@@ -1165,7 +1166,7 @@
 	
 	
    
 		
-		get_meta_informations (line 1502)
+		get_meta_informations (line 1505)
 	
     
 	
 	
@@ -1195,7 +1196,7 @@
 	
 	
    
 		
-		get_num_photos (line 2542)
+		get_num_photos (line 2545)
 	
     
 	
 	
@@ -1225,7 +1226,7 @@
 	
 	
    
 		
-		get_photo_details (line 392)
+		get_photo_details (line 395)
 	
     
 	
 	
@@ -1256,7 +1257,7 @@
 	
 	
    
 		
-		get_random_photo (line 2421)
+		get_random_photo (line 2424)
 	
     
 	
 	
@@ -1282,7 +1283,7 @@
 	
 	
    
 		
-		get_thumb_path (line 2493)
+		get_thumb_path (line 2496)
 	
     
 	
 	
@@ -1315,7 +1316,7 @@
 	
 	
    
 		
-		get_xml_tag_list (line 815)
+		get_xml_tag_list (line 818)
 	
     
 	
 	
@@ -1340,7 +1341,7 @@
 	
 	
    
 		
-		isValidDate (line 2447)
+		isValidDate (line 2450)
 	
     
 	
 	
@@ -1371,7 +1372,7 @@
 	
 	
    
 		
-		parse_uri (line 2633)
+		parse_uri (line 2636)
 	
     
 	
 	
@@ -1404,7 +1405,7 @@
 	
 	
    
 		
-		resetDateSearch (line 906)
+		resetDateSearch (line 909)
 	
     
 	
 	
@@ -1430,7 +1431,7 @@
 	
 	
    
 		
-		resetNameSearch (line 893)
+		resetNameSearch (line 896)
 	
     
 	
 	
@@ -1456,7 +1457,7 @@
 	
 	
    
 		
-		resetPhotoView (line 869)
+		resetPhotoView (line 872)
 	
     
 	
 	
@@ -1482,7 +1483,7 @@
 	
 	
    
 		
-		resetSlideShow (line 2403)
+		resetSlideShow (line 2406)
 	
     
 	
 	
@@ -1506,7 +1507,7 @@
 	
 	
    
 		
-		resetTags (line 804)
+		resetTags (line 807)
 	
     
 	
 	
@@ -1532,7 +1533,7 @@
 	
 	
    
 		
-		resetTagSearch (line 881)
+		resetTagSearch (line 884)
 	
     
 	
 	
@@ -1558,7 +1559,7 @@
 	
 	
    
 		
-		setTagCondition (line 1665)
+		setTagCondition (line 1668)
 	
     
 	
 	
@@ -1589,7 +1590,7 @@
 	
 	
    
 		
-		show (line 237)
+		show (line 240)
 	
     
 	
 	
@@ -1615,7 +1616,7 @@
 	
 	
    
 		
-		showCredits (line 1327)
+		showCredits (line 1330)
 	
     
 	
 	
@@ -1640,7 +1641,7 @@
 	
 	
    
 		
-		showPhoto (line 506)
+		showPhoto (line 509)
 	
     
 	
 	
@@ -1671,7 +1672,7 @@
 	
 	
    
 		
-		showPhotoIndex (line 1128)
+		showPhotoIndex (line 1131)
 	
     
 	
 	
@@ -1697,7 +1698,7 @@
 	
 	
    
 		
-		showTextImage (line 1890)
+		showTextImage (line 1893)
 	
     
 	
 	
@@ -1739,7 +1740,7 @@
 	
 	
    
 		
-		smarty_sort_select_list (line 2308)
+		smarty_sort_select_list (line 2311)
 	
     
 	
 	
@@ -1775,7 +1776,7 @@
 	
 	
    
 		
-		startSearch (line 1683)
+		startSearch (line 1686)
 	
     
 	
 	
@@ -1801,7 +1802,7 @@
 	
 	
    
 		
-		translate_path (line 493)
+		translate_path (line 496)
 	
     
 	
 	
@@ -1832,7 +1833,7 @@
 	
 	
    
 		
-		updateSortOrder (line 1735)
+		updateSortOrder (line 1738)
 	
     
 	
 	
@@ -1866,7 +1867,7 @@
 	
 	
    
 		
-		whatToDo (line 2270)
+		whatToDo (line 2273)
 	
     
 	
 	
@@ -1892,7 +1893,7 @@
 	
 	
    
 		
-		_error (line 1989)
+		_error (line 1992)
 	
     
 	
 	
@@ -1923,7 +1924,7 @@
 
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:57 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:42 +0200 by phpDocumentor 1.4.2
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_CFG.html b/docs/phpfspot/PHPFSPOT_CFG.html
deleted file mode 100644
index 024b367..0000000
--- a/docs/phpfspot/PHPFSPOT_CFG.html
+++ /dev/null
@@ -1,668 +0,0 @@
-
-
-  
-		
-			
-			Docs For Class PHPFSPOT_CFG
-			
-			
-		
-		
-			
    			
-
     Class PHPFSPOT_CFG
    
-
-
-
    
-	
    Description
    
-	
    
-					Description |
-													Vars (details)
-						|											Methods (details)
-						
-					
    
-	
    
-        		
-		
    
-			Located in /phpfspot_cfg.php (line 3)
-		
    
-		
-				
-		
    
-	
-			
    
-
    
-
-
-
-	
-	
    
-		
    Variable Summary
    
-		
    
-			Description |
-						Vars (details)
-							| 
-									Methods (details)
-							
-								
    
-		
    
-			
    
-																																																																																																																																																																																																
    
-					 
-					mixed
-					$base_path
-				
    
-																
    
-					 
-					mixed
-					$db_access
-				
    
-																
    
-					 
-					mixed
-					$error_found
-				
    
-																
    
-					 
-					mixed
-					$fspot_db
-				
    
-																
    
-					 
-					mixed
-					$hide_tags
-				
    
-																
    
-					 
-					mixed
-					$logging
-				
    
-																
    
-					 
-					mixed
-					$log_file
-				
    
-																
    
-					 
-					mixed
-					$mini_width
-				
    
-																
    
-					 
-					mixed
-					$page_title
-				
    
-																
    
-					 
-					mixed
-					$path_replace_from
-				
    
-																
    
-					 
-					mixed
-					$path_replace_to
-				
    
-																
    
-					 
-					mixed
-					$photo_width
-				
    
-																
    
-					 
-					mixed
-					$phpfspot_db
-				
    
-																
    
-					 
-					mixed
-					$smarty_path
-				
    
-																
    
-					 
-					mixed
-					$theme_name
-				
    
-																
    
-					 
-					mixed
-					$thumbs_per_page
-				
    
-																
    
-					 
-					mixed
-					$thumb_height
-				
    
-																
    
-					 
-					mixed
-					$thumb_path
-				
    
-																
    
-					 
-					mixed
-					$thumb_width
-				
    
-																
    
-					 
-					mixed
-					$use_autocomplete
-				
    
-																
    
-					 
-					mixed
-					$use_lightbox
-				
    
-																
    
-					 
-					mixed
-					$web_path
-				
    
-											
    
-		
    
-	
    
-
-	
-	
    
-		
    Method Summary
    
-		
    
-			Description |
-																		Vars (details)
-				 
-				|
-						Methods (details)
-		
    
-		
    			
-			
    
-																								
    
-					 
-											PHPFSPOT_CFG
-										__construct
-										()
-									
    
-											
    
-		
    
-	
    		
-
-	
-	
    
-		
    Variables
    
-		
    
-			Description |
-										Vars (details)
-						
-			
-										| 
-									Methods (details)
-							
-					
    
-		
    
-			
-
-
    
-
-	
    
-		
-		
-			mixed
-			$base_path
-			 =  "/var/www/beau.netshadow.at/htdocs"			(line 7)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$db_access
-			 =  "native"			(line 13)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$error_found
-			 =  0			(line 75)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$fspot_db
-			 =  "/var/www/beau.netshadow.at/fspot-data/photos.db"			(line 16)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$hide_tags
-			 = array("Favorites", "Hidden", "People", "Places", "Events")			(line 72)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$logging
-			 =  "display"			(line 64)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$log_file
-			 =  "phpfspot_err.log"			(line 67)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$mini_width
-			 =  "100"			(line 40)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$page_title
-			 =  "phpfspot - dynamic PHP gallery for F-Spot"			(line 5)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$path_replace_from
-			 =  "/home/unki/beau"			(line 50)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$path_replace_to
-			 =  "/var/www/beau.netshadow.at/fspot-data"			(line 51)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$photo_width
-			 =  "640"			(line 39)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$phpfspot_db
-			 =  "/var/www/beau.netshadow.at/fspot-data/phpfspot.db"			(line 21)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$smarty_path
-			 =  "/usr/share/php/smarty"			(line 33)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$theme_name
-			 =  "default"			(line 11)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$thumbs_per_page
-			 =  50			(line 44)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$thumb_height
-			 =  "145"			(line 38)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$thumb_path
-			 =  "/var/www/beau.netshadow.at/htdocs/thumbs"			(line 34)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$thumb_width
-			 =  "150"			(line 37)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$use_autocomplete
-			 =  true			(line 61)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$use_lightbox
-			 =  true			(line 56)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			mixed
-			$web_path
-			 =  "/"			(line 9)
-		
-	
    
-
-	
-	
-	
-		
-		
-
-
    
-						
-		
    
-	
    
-	
-	
-	
    
-		
    Methods
    
-		
    
-			Description |
-															Vars (details)
-														Methods (details)
-						
-		
    
-		
    
-			
-
-
    
-	
-	
    
-		
-		Constructor __construct (line 77)
-	
     
-	
-	
-	
      
-				
    • access: public
      • 
-			
    
-	
-	
    
-		PHPFSPOT_CFG
-		
-			__construct
-		
-				()
-			
    
-	
-		
-			
-	
    
-						
-		
    
-	
    
-
-	
-	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:05 +0200 by phpDocumentor 1.4.2
-	
    
-	
    
-
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_DB.html b/docs/phpfspot/PHPFSPOT_DB.html
index 749fb63..061faea 100644
--- a/docs/phpfspot/PHPFSPOT_DB.html
+++ b/docs/phpfspot/PHPFSPOT_DB.html
@@ -26,7 +26,7 @@
         		
 
    PHPFSPOT_DB class
    
 		
    
-			Located in /phpfspot_db.php (line 29)
+			Located in /phpfspot_db.php (line 30)
 		
    
 		
 				
@@ -111,11 +111,11 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 43)
+		Constructor __construct (line 44)
 	
     
 	
 	
@@ -145,11 +145,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		Destructor __destruct (line 63)
+		Destructor __destruct (line 64)
 	
     
 	
 	
@@ -171,11 +171,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		db_check_table_exists (line 253)
+		db_check_table_exists (line 254)
 	
     
 	
 	
@@ -203,11 +203,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		db_exec (line 163)
+		db_exec (line 164)
 	
     
 	
 	
@@ -234,11 +234,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		db_fetchSingleRow (line 206)
+		db_fetchSingleRow (line 207)
 	
     
 	
 	
@@ -265,11 +265,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		db_fetch_object (line 189)
+		db_fetch_object (line 190)
 	
     
 	
 	
@@ -294,11 +294,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		db_getNumRows (line 232)
+		db_getNumRows (line 233)
 	
     
 	
 	
@@ -325,11 +325,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		db_query (line 127)
+		db_query (line 128)
 	
     
 	
 	
@@ -361,7 +361,7 @@
 
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:54 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_IMG.html b/docs/phpfspot/PHPFSPOT_IMG.html
index 8a566d0..74ea3f9 100644
--- a/docs/phpfspot/PHPFSPOT_IMG.html
+++ b/docs/phpfspot/PHPFSPOT_IMG.html
@@ -27,7 +27,7 @@
 
    PHPFSPOT_IMG class
    
 
    handles phpfspot's photos. It will output either the photo binaries  or can also show error messages as a on-the-fly generated picture.
    
 		
    
-			Located in /phpfspot_img.php (line 35)
+			Located in /phpfspot_img.php (line 34)
 		
    
 		
 				
@@ -82,11 +82,11 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 43)
+		Constructor __construct (line 42)
 	
     
 	
 	
@@ -107,11 +107,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		Destructor __destruct (line 53)
+		Destructor __destruct (line 52)
 	
     
 	
 	
@@ -132,11 +132,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		show (line 68)
+		show (line 67)
 	
     
 	
 	
@@ -171,7 +171,7 @@
 
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:54 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_RPC.html b/docs/phpfspot/PHPFSPOT_RPC.html
index f825903..1b2d770 100644
--- a/docs/phpfspot/PHPFSPOT_RPC.html
+++ b/docs/phpfspot/PHPFSPOT_RPC.html
@@ -76,7 +76,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -101,7 +101,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -130,7 +130,7 @@
 
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:55 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/PHPFSPOT_TMPL.html b/docs/phpfspot/PHPFSPOT_TMPL.html
index 33f9597..e31bb78 100644
--- a/docs/phpfspot/PHPFSPOT_TMPL.html
+++ b/docs/phpfspot/PHPFSPOT_TMPL.html
@@ -78,15 +78,15 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 36)
+		Constructor __construct (line 37)
 	
     
 	
 	
-
    class constructor
    
+
    PHPFSPOT_TMPL constructor
    
 	
      
 				
    • access: public
      • 
 			
    
@@ -103,11 +103,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		show (line 64)
+		show (line 65)
 	
     
 	
 	
@@ -139,7 +139,7 @@
 
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:55 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_find_dups.php.html b/docs/phpfspot/_find_dups.php.html
index 79b800a..729148b 100644
--- a/docs/phpfspot/_find_dups.php.html
+++ b/docs/phpfspot/_find_dups.php.html
@@ -20,6 +20,8 @@
 												
    
 	
    	
 		
+
    *************************************************************************
    
+
    phpfspot, presents your F-Spot photo collection in Web browsers.
    Copyright (c) by Andreas Unterkircher
    This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
    This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
    You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    *************************************************************************
    
 		
 			
    
 
    
@@ -41,13 +43,13 @@
 		
 			require_once
 			("phpfspot.class.php")
-			(line 31)
+			(line 38)
 		
 	
    
 
 	
-
    *************************************************************************
    
-
    phpfspot, presents your F-Spot photo collection in Web browsers.
    Copyright (c) by Andreas Unterkircher
    This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
    This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
    You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    *************************************************************************
    
+
    find_dups.php
    
+
    find duplicated photos based on MD5 checksum
    
 	
 
    
 		
    
@@ -57,7 +59,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:49 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:23 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_gen_thumbs.php.html b/docs/phpfspot/_gen_thumbs.php.html
index 7d91cc2..169dcab 100644
--- a/docs/phpfspot/_gen_thumbs.php.html
+++ b/docs/phpfspot/_gen_thumbs.php.html
@@ -20,6 +20,8 @@
 												
    
 	
    	
 		
+
    *************************************************************************
    
+
    phpfspot, presents your F-Spot photo collection in Web browsers.
    Copyright (c) by Andreas Unterkircher
    This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
    This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
    You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    *************************************************************************
    
 		
 			
    
 
    
@@ -41,13 +43,13 @@
 		
 			require_once
 			("phpfspot.class.php")
-			(line 31)
+			(line 39)
 		
 	
    
 
 	
-
    *************************************************************************
    
-
    phpfspot, presents your F-Spot photo collection in Web browsers.
    Copyright (c) by Andreas Unterkircher
    This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
    This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
    You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    *************************************************************************
    
+
    gen_thumbs.php
    
+
    generate photo thumbnails on the console to avoid webserver overload
    
 	
 
    
 		
    
@@ -57,7 +59,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:53 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:34 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_index.php.html b/docs/phpfspot/_index.php.html
index f123f2e..3da7eda 100644
--- a/docs/phpfspot/_index.php.html
+++ b/docs/phpfspot/_index.php.html
@@ -20,6 +20,8 @@
 												
    
 	
    	
 		
+
    *************************************************************************
    
+
    phpfspot, presents your F-Spot photo collection in Web browsers.
    Copyright (c) by Andreas Unterkircher
    This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
    This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
    You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    *************************************************************************
    
 		
 			
    
 
    
@@ -41,13 +43,12 @@
 		
 			require_once
 			("phpfspot.class.php")
-			(line 25)
+			(line 30)
 		
 	
    
 
 	
-
    *************************************************************************
    
-
    phpfspot, presents your F-Spot photo collection in Web browsers.
    Copyright (c) by Andreas Unterkircher
    This program is free software; you can redistribute it and/or modify   it under the terms of the GNU General Public License as published by   the Free Software Foundation; either version 2 of the License, or   any later version.
    This program is distributed in the hope that it will be useful,   but WITHOUT ANY WARRANTY; without even the implied warranty of   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   GNU General Public License for more details.
    You should have received a copy of the GNU General Public License   along with this program; if not, write to the Free Software   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    *************************************************************************
    
+
    initialize phpfspot
    
 	
 
    
 		
    
@@ -57,7 +58,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:57 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:42 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot.class.php.html b/docs/phpfspot/_phpfspot.class.php.html
index 9ddd367..77aca8f 100644
--- a/docs/phpfspot/_phpfspot.class.php.html
+++ b/docs/phpfspot/_phpfspot.class.php.html
@@ -70,7 +70,7 @@
 		 
 		
 			require_once
-			("phpfspot_cfg.php")
+			("phpfspot_cfg.php")
 			(line 25)
 		
 	
    
@@ -102,7 +102,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:57 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:42 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_cfg.php.html b/docs/phpfspot/_phpfspot_cfg.php.html
deleted file mode 100644
index 142d994..0000000
--- a/docs/phpfspot/_phpfspot_cfg.php.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-  
-		
-			
-			Docs for page phpfspot_cfg.php
-			
-			
-		
-		
-			
    			
-
    File/phpfspot_cfg.php
    
-
-
-
    
-	
    Description
    
-	
    
-					Description |
-							Classes
-														
    
-	
    	
-		
-		
-			
    
-
    
-		
-		
-	
    
-		
    Classes
    
-		
    
-			Description |
-			Classes
-																	
    
-		
    	
-			
-				
-					
-					
-				
-								
-					
-					
-				
-							
    ClassDescription
    
-						 class
-						PHPFSPOT_CFG
-					
-											
-										
    
-		
    
-	
    
-
-	
-	
-	
-	
-	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:05 +0200 by phpDocumentor 1.4.2
-	
    
-	
    
-
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_db.php.html b/docs/phpfspot/_phpfspot_db.php.html
index 2246e34..6e28da8 100644
--- a/docs/phpfspot/_phpfspot_db.php.html
+++ b/docs/phpfspot/_phpfspot_db.php.html
@@ -59,7 +59,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:54 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_img.php.html b/docs/phpfspot/_phpfspot_img.php.html
index fe9e7d1..f52e323 100644
--- a/docs/phpfspot/_phpfspot_img.php.html
+++ b/docs/phpfspot/_phpfspot_img.php.html
@@ -64,7 +64,7 @@
 														
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -87,7 +87,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:54 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_phpfspot_tmpl.php.html b/docs/phpfspot/_phpfspot_tmpl.php.html
index 70b3de9..a88b3f0 100644
--- a/docs/phpfspot/_phpfspot_tmpl.php.html
+++ b/docs/phpfspot/_phpfspot_tmpl.php.html
@@ -59,7 +59,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:55 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/phpfspot/_rpc.php.html b/docs/phpfspot/_rpc.php.html
index 943ba9d..f8c7902 100644
--- a/docs/phpfspot/_rpc.php.html
+++ b/docs/phpfspot/_rpc.php.html
@@ -64,7 +64,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -85,7 +85,7 @@
 	
 	
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:25:06 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:55 +0200 by phpDocumentor 1.4.2
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/ric_CHANGELOG.html b/docs/ric_CHANGELOG.html
index 3e1e35a..367c686 100644
--- a/docs/ric_CHANGELOG.html
+++ b/docs/ric_CHANGELOG.html
@@ -74,7 +74,7 @@ phpfspot (1.0)
 
 
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:41 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:11 +0200 by phpDocumentor 1.4.2
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/ric_INSTALL.html b/docs/ric_INSTALL.html
index d241378..c86ca69 100644
--- a/docs/ric_INSTALL.html
+++ b/docs/ric_INSTALL.html
@@ -56,7 +56,7 @@ phpfspot install howto:
 
 
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:40 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:11 +0200 by phpDocumentor 1.4.2
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/ric_README.html b/docs/ric_README.html
index 2578177..06287e4 100644
--- a/docs/ric_README.html
+++ b/docs/ric_README.html
@@ -18,7 +18,7 @@ Desc:         dynamic PHP gallery for F-Spot
 
 
 	
    
-		Documentation generated on Sat, 12 Apr 2008 18:24:41 +0200 by phpDocumentor 1.4.2
+		Documentation generated on Sat, 12 Apr 2008 18:39:12 +0200 by phpDocumentor 1.4.2
 	
    
 	
 
\ No newline at end of file
diff --git a/find_dups.php b/find_dups.php
index 5d5c264..c6bfce9 100755
--- a/find_dups.php
+++ b/find_dups.php
@@ -23,6 +23,13 @@
  *
  ***************************************************************************/
 
+/**
+ * find_dups.php
+ *
+ * find duplicated photos based on MD5 checksum
+ *
+ * @package phpfspot
+ */
 if(!isset($_SERVER["TERM"])) {
    print "

    This script should only be invoked from command line!
    \n";
    die;
diff --git a/gen_docs.sh b/gen_docs.sh
index 1e58969..3070cfd 100755
--- a/gen_docs.sh
+++ b/gen_docs.sh
@@ -5,7 +5,7 @@
 phpdoc -o HTML:frames:earthli \
        -d . \
        -t docs \
-       -i 'thumbs/,resources/,templates_c/' \
+       -i 'thumbs/,resources/,templates_c/,phpfspot_cfg.php' \
        -ti 'phpfspot source-code documentation' \
        -dn 'phpfspot' \
        -s \
diff --git a/gen_thumbs.php b/gen_thumbs.php
index 3951fa8..5f4143e 100755
--- a/gen_thumbs.php
+++ b/gen_thumbs.php
@@ -23,6 +23,14 @@
  *
  ***************************************************************************/
 
+
+/**
+ * gen_thumbs.php
+ *
+ * generate photo thumbnails on the console to avoid webserver overload
+ *
+ * @package phpfspot
+ */
 if(!isset($_SERVER["TERM"])) {
    print "

    This script should only be invoked from command line!
    \n";
    die;
diff --git a/index.php b/index.php
index 3cdf3bb..0822da3 100644
--- a/index.php
+++ b/index.php
@@ -22,6 +22,11 @@
  *
  ***************************************************************************/
 
+/**
+ * initialize phpfspot
+ *
+ * @package phpfspot
+ */
 require_once "phpfspot.class.php";
 
 $fspot = new PHPFSPOT;
diff --git a/phpfspot.class.php b/phpfspot.class.php
index b8f45a8..95227aa 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -28,6 +28,9 @@ require_once "phpfspot_db.php";
 /**
  * PHPFSPOT main class
  *
+ * this class contains the most functions which will to the major
+ * work for phpfspot.
+ *
  * @package phpfspot
  */
 class PHPFSPOT {
@@ -2563,7 +2566,7 @@ class PHPFSPOT {
     * error message
     * @param string $file
     * @param boolean $silent
-    * @retrun boolean
+    * @return boolean
     */
    private function check_readable($file, $silent = null)
    {
diff --git a/phpfspot_db.php b/phpfspot_db.php
index 90fdb8c..e0cf39f 100644
--- a/phpfspot_db.php
+++ b/phpfspot_db.php
@@ -24,6 +24,7 @@
 
 /**
  * PHPFSPOT_DB class
+ *
  * @package phpfspot
  */
 class PHPFSPOT_DB {
diff --git a/phpfspot_img.php b/phpfspot_img.php
index 461f5c6..412c5f2 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -29,7 +29,6 @@ require_once "phpfspot.class.php";
  *
  * handles phpfspot's photos. It will output either the photo binaries
  * or can also show error messages as a on-the-fly generated picture.
- *
  * @package phpfspot
  */
 class PHPFSPOT_IMG {
-- 
cgit v1.2.3-18-g5258


From cd7402eecd6b5e50dcc62d8394342e6717c359e5 Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher 
Date: Sat, 12 Apr 2008 19:30:12 +0200
Subject: parse_uri() needs two parameters

Signed-off-by: Andreas Unterkircher 
---
 phpfspot.class.php | 6 +++---
 phpfspot_img.php   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 95227aa..b5dd177 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -543,7 +543,7 @@ class PHPFSPOT {
          return;
       }
 
-      $orig_path = $this->translate_path($this->parse_uri($details['uri']));
+      $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
       $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
 
       if(!file_exists($orig_path)) {
@@ -1557,7 +1557,7 @@ class PHPFSPOT {
       $details = $this->get_photo_details($idx);
 
       /* calculate file MD5 sum */
-      $full_path = $this->translate_path($this->parse_uri($details['uri']));
+      $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
 
       if(!file_exists($full_path)) {
          $this->_error("File ". $full_path ." does not exist\n");
@@ -2202,7 +2202,7 @@ class PHPFSPOT {
 
    
 ". $details['description']);
 
-         $orig_path = $this->translate_path($this->parse_uri($details['uri']));
+         $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
 
          /* get EXIF information if JPEG */
          if($details['mime'] == "image/jpeg") {
diff --git a/phpfspot_img.php b/phpfspot_img.php
index 412c5f2..f3eb308 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -78,7 +78,7 @@ class PHPFSPOT_IMG {
 
       /* no width specified - show photo in its original size */
       if($width == 0) {
-         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri']));
+         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath'));
       }
       /* show thumbnail */
       else {
-- 
cgit v1.2.3-18-g5258