X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=63a913937d8ac5eac60352bd724805e5e924de8b;hp=89017e0d4fcb98bce165e2ef9d9c6e3170b998fb;hb=e54956dad7e0632849db2a92eb7ceff88b52247d;hpb=453a3d3c582f1abfa5c9c05fc50c9c1edc004edc
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 89017e0..63a9139 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -49,6 +49,13 @@ class PHPFSPOT {
$this->cfg->product = "phpfspot";
$this->cfg->version = "1.2";
+ $this->sort_orders= array(
+ 'date_asc' => 'Date ↑',
+ 'date_desc' => 'Date ↓',
+ 'name_asc' => 'Name ↑',
+ 'name_desc' => 'Name ↓'
+ );
+
/* Check necessary requirements */
if(!$this->checkRequirements()) {
exit(1);
@@ -63,15 +70,21 @@ class PHPFSPOT {
$this->dbver = $this->getFspotDBVersion();
if(!is_writeable(dirname($this->cfg->phpfspot_db))) {
- print dirname($this->cfg->phpfspot_db) .": directory is not writeable!";
+ print dirname($this->cfg->phpfspot_db) .": directory is not writeable for user ". $this->getuid() ."\n";
exit(1);
}
-
+
+ if(!is_writeable($this->cfg->base_path ."/templates_c")) {
+ print $this->cfg->base_path ."/templates_c: directory is not writeable for user ". $this->getuid() ."\n";
+ exit(1);
+ }
+
$this->cfg_db = new PHPFSPOT_DB($this, $this->cfg->phpfspot_db);
if(!is_writeable($this->cfg->phpfspot_db)) {
print $this->cfg->phpfspot_db ." is not writeable for user ". $this->getuid() ."\n";
exit(1);
}
+
$this->check_config_table();
/* include Smarty template engine */
@@ -86,7 +99,9 @@ class PHPFSPOT {
/* check if all necessary indices exist */
$this->checkDbIndices();
- session_start();
+ /* if session is not yet started, do it now */
+ if(session_id() == "")
+ session_start();
if(!isset($_SESSION['tag_condition']))
$_SESSION['tag_condition'] = 'or';
@@ -124,65 +139,68 @@ class PHPFSPOT {
$this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
$this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name);
- $_SESSION['start_action'] = $_GET['mode'];
+ if(isset($_GET['mode'])) {
- switch($_GET['mode']) {
- case 'showpi':
- if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
- }
- if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
- }
- if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
- }
- break;
- case 'showp':
- if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
- $_SESSION['start_action'] = 'showp';
- }
- if(isset($_GET['id']) && is_numeric($_GET['id'])) {
- $_SESSION['current_photo'] = $_GET['id'];
- $_SESSION['start_action'] = 'showp';
- }
- if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date']);
- }
- if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date']);
- }
- break;
- case 'export':
- $this->tmpl->show("export.tpl");
- return;
- break;
- case 'slideshow':
- $this->tmpl->show("slideshow.tpl");
- return;
- break;
- case 'rss':
- if(isset($_GET['tags'])) {
- $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
- }
- if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
- $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
- }
- if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
- $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
- }
- $this->getRSSFeed();
- return;
- break;
+ $_SESSION['start_action'] = $_GET['mode'];
+
+ switch($_GET['mode']) {
+ case 'showpi':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+ }
+ if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
+ }
+ if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
+ $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
+ }
+ break;
+ case 'showp':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+ $_SESSION['start_action'] = 'showp';
+ }
+ if(isset($_GET['id']) && is_numeric($_GET['id'])) {
+ $_SESSION['current_photo'] = $_GET['id'];
+ $_SESSION['start_action'] = 'showp';
+ }
+ if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date']);
+ }
+ if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
+ $_SESSION['to_date'] = strtotime($_GET['to_date']);
+ }
+ break;
+ case 'export':
+ $this->tmpl->show("export.tpl");
+ return;
+ break;
+ case 'slideshow':
+ $this->tmpl->show("slideshow.tpl");
+ return;
+ break;
+ case 'rss':
+ if(isset($_GET['tags'])) {
+ $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']);
+ }
+ if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) {
+ $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00");
+ }
+ if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) {
+ $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59");
+ }
+ $this->getRSSFeed();
+ return;
+ break;
+ }
}
if(isset($_SESSION['from_date']) && isset($_SESSION['to_date']))
$this->tmpl->assign('date_search_enabled', true);
+ $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false);
$this->tmpl->assign('from_date', $this->get_calendar('from'));
$this->tmpl->assign('to_date', $this->get_calendar('to'));
- $this->tmpl->assign('sort_field', $this->get_sort_field());
$this->tmpl->assign('content_page', 'welcome.tpl');
$this->tmpl->show("index.tpl");
@@ -414,10 +432,12 @@ class PHPFSPOT {
if(!file_exists($orig_path)) {
$this->_error("Photo ". $orig_path ." does not exist!
\n");
+ return;
}
if(!is_readable($orig_path)) {
$this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n");
+ return;
}
/* If the thumbnail doesn't exist yet, try to create it */
@@ -503,6 +523,7 @@ class PHPFSPOT {
*/
public function getAvailableTags()
{
+ /* retrive tags from database */
$this->get_tags();
$output = "";
@@ -546,10 +567,10 @@ class PHPFSPOT {
if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags']))
continue;
- // calculate CSS font-size
- // find the $value in excess of $min_qty
- // multiply by the font-size increment ($size)
- // and add the $min_size set above
+ // calculate CSS font-size
+ // find the $value in excess of $min_qty
+ // multiply by the font-size increment ($size)
+ // and add the $min_size set above
$size = $min_size + (($value - $min_qty) * $step);
// uncomment if you want sizes in whole %:
$size = ceil($size);
@@ -574,9 +595,11 @@ class PHPFSPOT {
*/
public function getSelectedTags()
{
+ /* retrive tags from database */
$this->get_tags();
$output = "";
+
foreach($this->avail_tags as $tag)
{
// return all selected tags
@@ -585,8 +608,13 @@ class PHPFSPOT {
}
}
- $output = substr($output, 0, strlen($output)-2);
- print $output;
+ if($output != "") {
+ $output = substr($output, 0, strlen($output)-2);
+ return $output;
+ }
+ else {
+ return "no tags selected";
+ }
} // getSelectedTags()
@@ -602,6 +630,9 @@ class PHPFSPOT {
if(!isset($_SESSION['selected_tags']))
$_SESSION['selected_tags'] = Array();
+ if(isset($_SESSION['searchfor']))
+ unset($_SESSION['searchfor']);
+
if(!in_array($tag, $_SESSION['selected_tags']))
array_push($_SESSION['selected_tags'], $tag);
@@ -615,6 +646,9 @@ class PHPFSPOT {
*/
public function delTag($tag)
{
+ if(isset($_SESSION['searchfor']))
+ unset($_SESSION['searchfor']);
+
if(isset($_SESSION['selected_tags'])) {
$key = array_search($tag, $_SESSION['selected_tags']);
unset($_SESSION['selected_tags'][$key]);
@@ -880,8 +914,9 @@ class PHPFSPOT {
}
elseif($this->cfg->rows_per_page > 0) {
- if(!$_SESSION['begin_with'] || $_SESSION['begin_with'] == 0)
+ if(!isset($_SESSION['begin_with']) || $_SESSION['begin_with'] == 0) {
$begin_with = 0;
+ }
else {
$begin_with = $_SESSION['begin_with'];
@@ -914,30 +949,33 @@ class PHPFSPOT {
for($i = $begin_with; $i < $end_with; $i++) {
- $images[$rows][$cols] = $photos[$i];
- $img_id[$rows][$cols] = $i;
- $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
- $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
+ if(isset($photos[$i])) {
- $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
+ $images[$rows][$cols] = $photos[$i];
+ $img_id[$rows][$cols] = $i;
+ $img_name[$rows][$cols] = htmlspecialchars($this->getPhotoName($photos[$i], 15));
+ $img_title[$rows][$cols] = "Click to view photo ". htmlspecialchars($this->getPhotoName($photos[$i], 0));
- if(file_exists($thumb_path)) {
- $info = getimagesize($thumb_path);
- $img_width[$rows][$cols] = $info[0];
- $img_height[$rows][$cols] = $info[1];
- }
+ $thumb_path = $this->get_thumb_path($this->cfg->thumb_width, $photos[$i]);
- if($cols == $this->cfg->thumbs_per_row-1) {
- $cols = 0;
- $rows++;
- $images[$rows] = Array();
- $img_width[$rows] = Array();
- $img_height[$rows] = Array();
- }
- else {
- $cols++;
- }
- }
+ if(file_exists($thumb_path)) {
+ $info = getimagesize($thumb_path);
+ $img_width[$rows][$cols] = $info[0];
+ $img_height[$rows][$cols] = $info[1];
+ }
+
+ if($cols == $this->cfg->thumbs_per_row-1) {
+ $cols = 0;
+ $rows++;
+ $images[$rows] = Array();
+ $img_width[$rows] = Array();
+ $img_height[$rows] = Array();
+ }
+ else {
+ $cols++;
+ }
+ }
+ }
// +1 for for smarty's selection iteration
$rows++;
@@ -956,6 +994,8 @@ class PHPFSPOT {
/* do we have to display the page selector ? */
if($this->cfg->rows_per_page != 0) {
+
+ $page_select = "";
/* calculate the page switchers */
$previous_start = $begin_with - ($this->cfg->rows_per_page * $this->cfg->thumbs_per_row);
@@ -1140,9 +1180,9 @@ class PHPFSPOT {
// If requested width is more then the actual image width,
// do not generate a thumbnail, instead safe the original
- // as thumbnail but with lower quality
-
- if($width >= $cur_width) {
+ // as thumbnail but with lower quality. But if the image
+ // is to heigh too, then we still have to resize it.
+ if($width >= $cur_width && $cur_height < $this->cfg->thumb_height) {
$result = imagejpeg($src_img, $thumb_image, 75);
imagedestroy($src_img);
return true;
@@ -1395,12 +1435,11 @@ class PHPFSPOT {
* getPhotoSelection() will then only return the matching
* photos.
*/
- public function startSearch($searchfor, $sort_order, $from = 0, $to = 0)
+ public function startSearch($searchfor, $from = 0, $to = 0)
{
$this->get_tags();
$_SESSION['searchfor'] = $searchfor;
- $_SESSION['sort_order'] = $sort_order;
if($from != 0)
$_SESSION['from_date'] = strtotime($from);
else
@@ -1421,6 +1460,23 @@ class PHPFSPOT {
} // startSearch()
+ /**
+ * updates sort order in session variable
+ *
+ * this function is invoked by RPC and will sort the requested
+ * sort order in the session variable.
+ */
+ public function updateSortOrder($order)
+ {
+ if(isset($this->sort_orders[$order])) {
+ $_SESSION['sort_order'] = $order;
+ return "ok";
+ }
+
+ return "unkown error";
+
+ } // updateSortOrder()
+
/**
* rotate image
*
@@ -1627,19 +1683,23 @@ class PHPFSPOT {
*/
private function get_calendar($mode)
{
- $year = $_SESSION[$mode .'_date'] ? date("Y", $_SESSION[$mode .'_date']) : date("Y");
- $month = $_SESSION[$mode .'_date'] ? date("m", $_SESSION[$mode .'_date']) : date("m");
- $day = $_SESSION[$mode .'_date'] ? date("d", $_SESSION[$mode .'_date']) : date("d");
+ $year = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y");
+ $month = isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m");
+ $day = isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d");
$output = "\n";
$output.= "\n";
$output.= "\n";
+
return $output;
} // get_calendar()
@@ -1838,7 +1898,7 @@ class PHPFSPOT {
private function getCurrentTags()
{
$current_tags = "";
- if($_SESSION['selected_tags'] != "") {
+ if(isset($_SESSION['selected_tags']) && $_SESSION['selected_tags'] != "") {
foreach($_SESSION['selected_tags'] as $tag)
$current_tags.= $tag .",";
$current_tags = substr($current_tags, 0, strlen($current_tags)-1);
@@ -1900,20 +1960,21 @@ class PHPFSPOT {
/**
* returns a select-dropdown box to select photo index sort parameters
*/
- private function get_sort_field()
+ public function smarty_sort_select_list($params, &$smarty)
{
- $output = "";
+
return $output;
- } // get_sort_field()
+ } // smarty_sort_select_list()
/**
* returns the currently selected sort order
@@ -1928,10 +1989,20 @@ class PHPFSPOT {
return " ORDER BY p.time DESC";
break;
case 'name_asc':
- return " ORDER BY p.name ASC";
+ if($this->dbver < 9) {
+ return " ORDER BY p.name ASC";
+ }
+ else {
+ return " ORDER BY basename(p.uri) ASC";
+ }
break;
case 'name_desc':
- return " ORDER BY p.name DESC";
+ if($this->dbver < 9) {
+ return " ORDER BY p.name DESC";
+ }
+ else {
+ return " ORDER BY basename(p.uri) DESC";
+ }
break;
}