+ */
+class fs_filelister {
+
+ var $_list = array();
+
+ var $_directory = null;
+
+ // constructor
+ function __construct($directory = null) {
+ if ($directory)
+ $this->_directory = $directory;
+ $this->_listFiles($this->_directory);
+ }
+
+ function _checkFile($directory, $file) {
+ if (!is_dir("$directory/$file"))
+ array_push($this->_list, $file);
+ return 0;
+ }
+
+ function _exitingDir($directory, $file) {
+ }
+
+ function _listFiles($directory) {
+
+ // Try to open the directory
+ if (!file_exists($directory))
+ return array();
+
+ if ($dir = opendir($directory)) {
+ // Add the files
+ while ($file = readdir($dir)) {
+ if (!fs_is_directorycomponent($file)) {
+ $action = $this->_checkFile($directory, $file);
+
+ // $action == 0: ok, go on
+ // $action == 1: recurse
+ // $action == 2: exit function
+
+ switch ($action) {
+ case (1):
+ {
$this->_listFiles("$directory/$file");
$this->_exitingDir($directory, $file);
break;
}
- case (2): {
+ case (2):
+ {
return false;
}
- }
}
-
}
-
+ }
+
// Finish off the function
closedir($dir);
return true;
- }
- else return false;
-
- }
-
- function getList() {
- //$this->_listFiles($this->_directory);
- return $this->_list;
- }
-
- function count() {
- if (!isset ($this->count))
- $this->count = count($this->_list);
- return $this->count;
- }
-
- }
-
- class fs_pathlister extends fs_filelister {
- function _checkFile($directory, $file) {
- $f = "$directory/$file";
- if (!is_dir($f))
- array_push($this->_list, $f);
- else
- return 1;
- }
-
- }
-
- // dir list
- function fs_list_dirs($dir) {
- $dh = opendir($dir);
- while (false !== ($filename = readdir($dh))) {
- if ( ($filename[0] != '.') ) {
- // $id = lang_id($filename);
- $files[] = $filename;
- }
-
-
- }
- sort($files);
- return $files;
- }
-
-
- /**
- * function fs_mkdir
- *
- * Function from : {@link http://www.php.net/function.mkdir.php}
- *
- * Recursively creates dirs.
- * Returns true on success, else false
- *
- * @param string $path Directory or directories to create
- * @param int $mode octal mode value; same as UNIX chmod; defaults to 0777 (rwrwrw);
- * @return bool
- *
- * @todo cleanup & check bool return value
- *
- */
- function fs_mkdir($dir, $mode=DIR_PERMISSIONS) {
- if (is_dir($dir) || (@mkdir($dir,$mode))) {@chmod($dir, $mode); return TRUE;}
- if (!fs_mkdir(dirname($dir),$mode)) return FALSE;
- return (@mkdir($dir,$mode) && @chmod($dir, $mode));
- }
-
-
-
- /**
- * function fs_delete
- *
- * Deletes a file and recursively deletes dirs, if they're empty
- *
- */
- function fs_delete($path) {
-
- if (file_exists($path)) {
-
- $fsuccess = unlink($path);
- $dsuccess = true;
-
- while ($dsuccess) {
-
- $path = dirname($path);
- $dsuccess = @rmdir($path);
-
- }
-
- // unlink can return both 0 and false -__-'
- return ($fsuccess);
-
- }
-
- // in our particular implementation
- // you can always delete a non existent file;
- // anyway, we'll return a value != false
- // so that we can anyway track it back
-
- return 2;
-
-
- }
-
- /**
- * function fs_recursive_chmod
- *
- * Perform a recursive reset of file permission in the given $path
- * and its subdirectories to 0777
- *
- * @param $fpath dir path
- * @return bool
- *
- */
-
- class fs_chmodder extends fs_filelister {
-
- var $_chmod_dir;
- var $_chmod_file;
-
- function __construct($directory, $ch_file=FILE_PERMISSIONS, $ch_dir=DIR_PERMISSIONS) {
- $this->_directory = $directory;
- $this->_chmod_file = $ch_file;
- $this->_chmod_dir = $ch_dir;
- parent::__construct();
- }
-
- function _checkFile($directory, $file) {
- $retval = 0;
- $path = "$directory/$file";
- if (is_dir($path))
- $retval = 1;
- if ( !@chmod($path, ($retval? $this->_chmod_dir : $this->_chmod_file ) ) )
- array_push($this->_list, $path);
-
- return $retval;
- }
- }
-
- function fs_chmod_recursive($fpath=FP_CONTENT) {
- $obj = new fs_chmodder($fpath);
- return $obj->getList();
- }
-
-
-
- /**
- * recursive deletion
- * deletes all files and directories recursively in the given $path
- * @param $fpath dir path
- * @return bool
- */
-
- /*class fs_deleter extends fs_filelister {
-
- function fs_deleter($directory) {
- $this->_directory = $directory;
- parent::__construct();
- }
-
- function _checkFile($directory, $file) {
-
- $path = "$directory/$file";
-
- /*
- * open dir handle prevents directory deletion of php5 (and probably win)
- * thanks to cimangi for noticing and
- * giving a possible solution:
- *
- * filenames are cached and then deleted
- //
-
- if ( is_dir($path) ) {
- return 1;
- } elseif ( file_exists($path) ) {
- array_push($this->_list, $path);
- return 0;
- } else {
- return 2;
- }
-
- }
-
- }
-
- */
-
- /*
- * open dir handle prevents directory deletion of php5 (and probably win)
- * thanks to cimangi for noticing and
- * giving a possible solution;
- *
- * paths are now cached and then deleted
- */
-
- function fs_delete_recursive($path) {
- if (file_exists($path)) {
-
- $obj = new fs_pathlister($path);
- $list = ($obj->getList());
-
- unset($obj);
-
- $elem = null;
- while($elem = array_pop($list)) {
- $elem;
- fs_delete($elem);
- }
-
-
-
- }
-
-
- return true;
- }
-
-
-
- function fs_copy($source, $dest) {
- if ($contents = io_load_file($source)) {
- return io_write_file($dest, $contents);
- }
- return false;
+ } else
+ return false;
}
+ function getList() {
+ // $this->_listFiles($this->_directory);
+ return $this->_list;
+ }
+ function count() {
+ if (!isset($this->count))
+ $this->count = count($this->_list);
+ return $this->count;
+ }
+
+}
+
+class fs_pathlister extends fs_filelister {
+
+ function _checkFile($directory, $file) {
+ $f = "$directory/$file";
+ if (!is_dir($f))
+ array_push($this->_list, $f);
+ else
+ return 1;
+ }
+
+}
+
+// dir list
+function fs_list_dirs($dir) {
+ $dh = opendir($dir);
+ while (false !== ($filename = readdir($dh))) {
+ if (($filename [0] != '.')) {
+ // $id = lang_id($filename);
+ $files [] = $filename;
+ }
+ }
+ sort($files);
+ return $files;
+}
+
+/**
+ * function fs_mkdir
+ *
+ * Function from : {@link http://www.php.net/function.mkdir.php}
+ *
+ * Recursively creates dirs.
+ * Returns true on success, else false
+ *
+ * @param string $path
+ * Directory or directories to create
+ * @param int $mode
+ * octal mode value; same as UNIX chmod; defaults to 0777 (rwrwrw);
+ * @return bool
+ *
+ * @todo cleanup & check bool return value
+ *
+ */
+function fs_mkdir($dir, $mode = DIR_PERMISSIONS) {
+ if (is_dir($dir) || (@mkdir($dir, $mode))) {
+ @chmod($dir, $mode);
+ return TRUE;
+ }
+ if (!fs_mkdir(dirname($dir), $mode))
+ return FALSE;
+ return (@mkdir($dir, $mode) && @chmod($dir, $mode));
+}
+
+/**
+ * function fs_delete
+ *
+ * Deletes a file and recursively deletes dirs, if they're empty
+ */
+function fs_delete($path) {
+ if (file_exists($path)) {
+
+ $fsuccess = unlink($path);
+ $dsuccess = true;
+
+ while ($dsuccess) {
+
+ $path = dirname($path);
+ $dsuccess = @rmdir($path);
+ }
+
+ // unlink can return both 0 and false -__-'
+ return ($fsuccess);
+ }
+
+ // in our particular implementation
+ // you can always delete a non existent file;
+ // anyway, we'll return a value != false
+ // so that we can anyway track it back
+
+ return 2;
+}
+
+/**
+ * function fs_recursive_chmod
+ *
+ * Perform a recursive reset of file permission in the given $path
+ * and its subdirectories to 0777
+ *
+ * @param $fpath dir
+ * path
+ * @return bool
+ *
+ */
+class fs_chmodder extends fs_filelister {
+
+ var $_chmod_dir;
+
+ var $_chmod_file;
+
+ function __construct($directory, $ch_file = FILE_PERMISSIONS, $ch_dir = DIR_PERMISSIONS) {
+ $this->_directory = $directory;
+ $this->_chmod_file = $ch_file;
+ $this->_chmod_dir = $ch_dir;
+ parent::__construct();
+ }
+
+ function _checkFile($directory, $file) {
+ $retval = 0;
+ $path = "$directory/$file";
+ if (is_dir($path))
+ $retval = 1;
+ if (!@chmod($path, ($retval ? $this->_chmod_dir : $this->_chmod_file)))
+ array_push($this->_list, $path);
+
+ return $retval;
+ }
+
+}
+
+function fs_chmod_recursive($fpath = FP_CONTENT) {
+ $obj = new fs_chmodder($fpath);
+ return $obj->getList();
+}
+
+/**
+ * recursive deletion
+ * deletes all files and directories recursively in the given $path
+ *
+ * @param $fpath dir
+ * path
+ * @return bool
+ */
+
+/*
+ * class fs_deleter extends fs_filelister {
+ *
+ * function fs_deleter($directory) {
+ * $this->_directory = $directory;
+ * parent::__construct();
+ * }
+ *
+ * function _checkFile($directory, $file) {
+ *
+ * $path = "$directory/$file";
+ *
+ * /*
+ * open dir handle prevents directory deletion of php5 (and probably win)
+ * thanks to cimangi for noticing and
+ * giving a possible solution:
+ *
+ * filenames are cached and then deleted
+ * //
+ *
+ * if ( is_dir($path) ) {
+ * return 1;
+ * } elseif ( file_exists($path) ) {
+ * array_push($this->_list, $path);
+ * return 0;
+ * } else {
+ * return 2;
+ * }
+ *
+ * }
+ *
+ * }
+ *
+ */
+
+/*
+ * open dir handle prevents directory deletion of php5 (and probably win)
+ * thanks to cimangi for noticing and
+ * giving a possible solution;
+ *
+ * paths are now cached and then deleted
+ */
+function fs_delete_recursive($path) {
+ if (file_exists($path)) {
+
+ $obj = new fs_pathlister($path);
+ $list = ($obj->getList());
+
+ unset($obj);
+
+ $elem = null;
+ while ($elem = array_pop($list)) {
+ $elem;
+ fs_delete($elem);
+ }
+ }
+
+ return true;
+}
+
+function fs_copy($source, $dest) {
+ if ($contents = io_load_file($source)) {
+ return io_write_file($dest, $contents);
+ }
+ return false;
+}
+
+/**
+ * Checks if the file with the given name is a directory component ('.' or '..').
+ *
+ * @param string $filename
+ * the file name
+ * @return boolean true if the file is a directory component; otherwise false
+ */
+function fs_is_directorycomponent($filename) {
+ return $filename === '.' || $filename === '..';
+}
+
+/**
+ * Checks if the file with the given name is a hidden file (i.e., starts with a '.').
+ *
+ * @param string $filename
+ * the file name
+ * @return boolean true if the file is a hidden file; otherwise false
+ */
+function fs_is_hidden_file($filename) {
+ return strlen($filename) > 0 && substr($filename, 0, 1) === '.';
+}
\ No newline at end of file
diff --git a/fp-includes/core/core.gallery.php b/fp-includes/core/core.gallery.php
new file mode 100644
index 0000000..b7dc21d
--- /dev/null
+++ b/fp-includes/core/core.gallery.php
@@ -0,0 +1,136 @@
+getlist();
+ foreach ($l as $i => $f) {
+ // remove caption files
+ if ($f === GALLERY_CAPTIONS_FILENAME || $f === GALLERY_CAPTIONS_LEGACYFILENAME) {
+ array_splice($l, $i, 1);
+ }
+ }
+ sort($l);
+ return $l;
+}
+
+/**
+ * Reads the captions from the given gallery directory.
+ *
+ * @param string $galleryDir
+ * the gallery dir, e.g. 'images/NameOfTheGallery'
+ * @return array the gallery captions as associative array { filename => caption }
+ */
+function gallery_read_captions($galleryDir) {
+ $captions = array();
+
+ $captionsFileContent = null;
+ $galleryDirPathAbs = ABS_PATH . FP_CONTENT . $galleryDir . '/';
+ // read captions.conf from gallery dir
+ if (file_exists($galleryDirPathAbs . GALLERY_CAPTIONS_FILENAME)) {
+ $captionsFileContent = file($galleryDirPathAbs . GALLERY_CAPTIONS_FILENAME);
+ } //
+ // legacy mode: if captions.conf is not available, check for texte.conf
+ elseif (file_exists($galleryDirPathAbs . GALLERY_CAPTIONS_LEGACYFILENAME)) {
+ $captionsFileContent = file($galleryDirPathAbs . GALLERY_CAPTIONS_LEGACYFILENAME);
+ } //
+ // no caption file available
+ else {
+ return array();
+ }
+
+ // read captions file line by line
+ foreach ($captionsFileContent as $currentline) {
+ // image file name is before of the '=' character, ...
+ $image = trim(substr($currentline, 0, strpos($currentline, '=')));
+ // ... the caption after.
+ $caption = trim(substr($currentline, (strpos($currentline, '=') + 1)));
+ // $captions [$image] = htmlentities($descript);
+ $captions [$image] = $caption;
+ }
+ return $captions;
+}
+
+/**
+ * Stores the given captions for the given gallery
+ *
+ * @param string $galleryName
+ * the gallery dir, e.g. 'NameOfTheGallery'
+ * @param array $captions
+ * the gallery captions as associative array { filename => caption }
+ * @return boolean true if captions were written successfully; false otherwise
+ */
+function gallery_write_captions($galleryName, $captions) {
+ $gallerydirPath = IMAGES_DIR . $galleryName;
+ if (!file_exists($gallerydirPath)) {
+ return false;
+ }
+ $captionfilePath = IMAGES_DIR . $galleryName . DIRECTORY_SEPARATOR . GALLERY_CAPTIONS_FILENAME;
+ $captionfileHandle = fopen($captionfilePath, 'w');
+
+ $filecontent = '';
+ foreach ($captions as $filename => $caption) {
+ $filecontent .= $filename . ' = ' . $caption . PHP_EOL;
+ }
+
+ fwrite($captionfileHandle, $filecontent);
+ fclose($captionfileHandle);
+
+ // Updating from legacy versions: If legacy captions fill still exists, delete if
+ $legacyCaptionfilePath = IMAGES_DIR . $galleryName . DIRECTORY_SEPARATOR . GALLERY_CAPTIONS_LEGACYFILENAME;
+ if (file_exists($legacyCaptionfilePath)) {
+ unlink($legacyCaptionfilePath);
+ }
+ return true;
+}
\ No newline at end of file
diff --git a/fp-includes/core/core.theme.php b/fp-includes/core/core.theme.php
index a835e27..2c64c17 100644
--- a/fp-includes/core/core.theme.php
+++ b/fp-includes/core/core.theme.php
@@ -120,7 +120,7 @@ function theme_list() {
$dh = opendir($dir);
$i = 0;
while (false !== ($filename = readdir($dh))) {
- if (($filename != '.') && ($filename != '..')) {
+ if (!fs_is_directorycomponent($filename)) {
$files [$i++] = $filename;
}
}
diff --git a/fp-includes/core/core.wp-pluggable-funcs.php b/fp-includes/core/core.wp-pluggable-funcs.php
index 1e1957e..815e020 100755
--- a/fp-includes/core/core.wp-pluggable-funcs.php
+++ b/fp-includes/core/core.wp-pluggable-funcs.php
@@ -46,7 +46,8 @@ if (!function_exists('get_nextpage_link')) :
$a = _get_nextprev_link('NextPage');
- if ($q->single) {
+ // show next entry link only if there actually is a next entry - and only if one single entry is displayed
+ if (isset($a) && $q->single) {
$a [0] .= ' » ';
}
@@ -62,7 +63,8 @@ if (!function_exists('get_prevpage_link')) :
$a = _get_nextprev_link('PrevPage');
- if ($q->single) {
+ // show previous entry link only if there actually is a previous entry - and only if one single entry is displayed
+ if (isset($a) && $q->single) {
$a [0] = ' « ' . $a [0];
}
diff --git a/fp-includes/core/includes.php b/fp-includes/core/includes.php
index 37cb377..58cd496 100755
--- a/fp-includes/core/includes.php
+++ b/fp-includes/core/includes.php
@@ -1,48 +1,45 @@
diff --git a/fp-includes/smarty/internals/core.rm_auto.php b/fp-includes/smarty/internals/core.rm_auto.php
index b251f64..aca23a1 100644
--- a/fp-includes/smarty/internals/core.rm_auto.php
+++ b/fp-includes/smarty/internals/core.rm_auto.php
@@ -1,6 +1,8 @@
$params ['auto_base'],
+ 'level' => 0,
+ 'exp_time' => $params ['exp_time']
+ );
+ require_once (SMARTY_CORE_DIR . 'core.rmdir.php');
+ $_res = smarty_core_rmdir($_params, $smarty);
+ } else {
+ $_tname = $smarty->_get_auto_filename($params ['auto_base'], $params ['auto_source'], $params ['auto_id']);
- if(!isset($params['auto_id']) && !isset($params['auto_source'])) {
- $_params = array(
- 'dirname' => $params['auto_base'],
- 'level' => 0,
- 'exp_time' => $params['exp_time']
- );
- require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
- $_res = smarty_core_rmdir($_params, $smarty);
- } else {
- $_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']);
+ if (isset($params ['auto_source'])) {
+ if (isset($params ['extensions'])) {
+ $_res = false;
+ foreach ((array) $params ['extensions'] as $_extension)
+ $_res |= $smarty->_unlink($_tname . $_extension, $params ['exp_time']);
+ } else {
+ $_res = $smarty->_unlink($_tname, $params ['exp_time']);
+ }
+ } elseif ($smarty->use_sub_dirs) {
+ $_params = array(
+ 'dirname' => $_tname,
+ 'level' => 1,
+ 'exp_time' => $params ['exp_time']
+ );
+ require_once (SMARTY_CORE_DIR . 'core.rmdir.php');
+ $_res = smarty_core_rmdir($_params, $smarty);
+ } else {
+ // remove matching file names
+ $_handle = opendir($params ['auto_base']);
+ $_res = true;
+ while (false !== ($_filename = readdir($_handle))) {
+ if (fs_is_directorycomponent($_filename)) {
+ continue;
+ } elseif (substr($params ['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) {
+ $_res &= (bool) $smarty->_unlink($params ['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params ['exp_time']);
+ }
+ }
+ }
+ }
- if(isset($params['auto_source'])) {
- if (isset($params['extensions'])) {
- $_res = false;
- foreach ((array)$params['extensions'] as $_extension)
- $_res |= $smarty->_unlink($_tname.$_extension, $params['exp_time']);
- } else {
- $_res = $smarty->_unlink($_tname, $params['exp_time']);
- }
- } elseif ($smarty->use_sub_dirs) {
- $_params = array(
- 'dirname' => $_tname,
- 'level' => 1,
- 'exp_time' => $params['exp_time']
- );
- require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
- $_res = smarty_core_rmdir($_params, $smarty);
- } else {
- // remove matching file names
- $_handle = opendir($params['auto_base']);
- $_res = true;
- while (false !== ($_filename = readdir($_handle))) {
- if($_filename == '.' || $_filename == '..') {
- continue;
- } elseif (substr($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) {
- $_res &= (bool)$smarty->_unlink($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params['exp_time']);
- }
- }
- }
- }
-
- return $_res;
+ return $_res;
}
/* vim: set expandtab: */
diff --git a/fp-includes/smarty/internals/core.rmdir.php b/fp-includes/smarty/internals/core.rmdir.php
index 2166c44..7408317 100644
--- a/fp-includes/smarty/internals/core.rmdir.php
+++ b/fp-includes/smarty/internals/core.rmdir.php
@@ -1,6 +1,8 @@
$params['dirname'] . DIRECTORY_SEPARATOR . $_entry,
- 'level' => $params['level'] + 1,
- 'exp_time' => $params['exp_time']
- );
- smarty_core_rmdir($_params, $smarty);
- }
- else {
- $smarty->_unlink($params['dirname'] . DIRECTORY_SEPARATOR . $_entry, $params['exp_time']);
- }
- }
- }
- closedir($_handle);
- }
-
- if ($params['level']) {
- return @rmdir($params['dirname']);
- }
- return (bool)$_handle;
+ while (false !== ($_entry = readdir($_handle))) {
+ if (!fs_is_directorycomponent($_entry)) {
+ if (@is_dir($params ['dirname'] . DIRECTORY_SEPARATOR . $_entry)) {
+ $_params = array(
+ 'dirname' => $params ['dirname'] . DIRECTORY_SEPARATOR . $_entry,
+ 'level' => $params ['level'] + 1,
+ 'exp_time' => $params ['exp_time']
+ );
+ smarty_core_rmdir($_params, $smarty);
+ } else {
+ $smarty->_unlink($params ['dirname'] . DIRECTORY_SEPARATOR . $_entry, $params ['exp_time']);
+ }
+ }
+ }
+ closedir($_handle);
+ }
+ if ($params ['level']) {
+ return @rmdir($params ['dirname']);
+ }
+ return (bool) $_handle;
}
/* vim: set expandtab: */
diff --git a/fp-interface/lang/pt-br/lang.conf.php b/fp-interface/lang/pt-br/lang.conf.php
index 866e3e6..ae0e64d 100644
--- a/fp-interface/lang/pt-br/lang.conf.php
+++ b/fp-interface/lang/pt-br/lang.conf.php
@@ -1,10 +1,9 @@
diff --git a/fp-interface/sharedtpls/contact.tpl b/fp-interface/sharedtpls/contact.tpl
index c894976..8717b63 100755
--- a/fp-interface/sharedtpls/contact.tpl
+++ b/fp-interface/sharedtpls/contact.tpl
@@ -1,10 +1,5 @@
{$lang.contact.descr}
-{validate id="name" message=$lang.contact.error.name append="error"}
-{validate id="email" message=$lang.contact.error.email append="error"}
-{validate id="www" message=$lang.contact.error.www append="error"}
-{validate id="content" message=$lang.contact.error.content append="error"}
-