diff --git a/admin.php b/admin.php
index 004bac218..c327010b3 100644
--- a/admin.php
+++ b/admin.php
@@ -74,7 +74,6 @@ $conf_link = $link_start.'configuration§ion=';
$title = l10n('PhpWebGallery Administration'); // for include/page_header.php
$page['page_banner'] = '
'.l10n('PhpWebGallery Administration').'
';
$page['body_id'] = 'theAdminPage';
-include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->set_filenames(array('admin' => 'admin.tpl'));
@@ -115,7 +114,7 @@ if ($conf['ws_access_control']) // Do we need to display ws_checker
);
}
-// required before plugin page inclusion
+//---------------------------------------------------------------- plugin menus
$plugin_menu_links = array(
array(
'NAME' => l10n('admin'),
@@ -124,16 +123,15 @@ $plugin_menu_links = array(
);
$plugin_menu_links = trigger_event('get_admin_plugin_menu_links',
$plugin_menu_links );
-
-
-include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
-
-//------------------------------------------------------------- content display
foreach ($plugin_menu_links as $menu_item)
{
$template->assign_block_vars('plugin_menu.menu_item', $menu_item);
}
+include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
+
+//------------------------------------------------------------- content display
+
// +-----------------------------------------------------------------------+
// | errors & infos |
// +-----------------------------------------------------------------------+
@@ -154,6 +152,7 @@ if (count($page['infos']) != 0)
}
}
+include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->parse('admin');
// +-----------------------------------------------------------------------+
@@ -171,6 +170,7 @@ if (
'cat_options', // ?only POST; public/private; lock/unlock
'cat_perm', // ?only POST
'element_set', // ?only POST; associate/dissociate
+ 'picture_modify', // ?only POST; associate/dissociate
'user_list', // ?only POST; group assoc
'user_perm',
'group_perm',
diff --git a/admin/site_update.php b/admin/site_update.php
index 7e83d62fb..f19b10d1e 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -231,7 +231,6 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
// retrieve sub-directories fulldirs from the site reader
$fs_fulldirs = $site_reader->get_full_directories($basedir);
- //print_r( $fs_fulldirs ); echo "
";
// get_full_directories doesn't include the base directory, so if it's a
// category directory, we need to include it in our array
@@ -352,9 +351,9 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
$counts['del_categories'] = count($to_delete);
}
- echo ''."\n";
+ $template->output .= ''."\n";
}
// +-----------------------------------------------------------------------+
// | files / elements |
@@ -366,8 +365,9 @@ if (isset($_POST['submit']) and $_POST['sync'] == 'files'
$start= $start_files;
$fs = $site_reader->get_elements($basedir);
- //print_r($fs); echo "
";
- echo '\n";
+ $template->output .= '\n";
$cat_ids = array_diff(array_keys($db_categories), $to_delete);
@@ -571,9 +571,9 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id
$counts['del_elements'] = count($to_delete_elements);
}
- echo ''."\n";
+ $template->output .= ''."\n";
// retrieving informations given by uploaders
if (!$simulate and count($cat_ids) > 0)
@@ -643,15 +643,15 @@ if (isset($_POST['submit'])
{
$start = get_moment();
update_category('all');
- echo ''."\n";
+ $template->output .= ''."\n";
$start = get_moment();
ordering();
update_global_rank();
- echo ''."\n";
+ $template->output .= ''."\n";
}
if ($_POST['sync'] == 'files')
@@ -670,9 +670,9 @@ if (isset($_POST['submit'])
$files = get_filelist($opts['category_id'], $site_id,
$opts['recursive'],
false);
- echo ''."\n";
+ $template->output .= ''."\n";
$start = get_moment();
$datas = array();
@@ -716,9 +716,9 @@ if (isset($_POST['submit'])
$datas
);
}
- echo ''."\n";
+ $template->output .= ''."\n";
}// end if sync files
}
@@ -772,9 +772,9 @@ if (isset($_POST['submit']) and preg_match('/^metadata/', $_POST['sync'])
$opts['recursive'],
$opts['only_new']);
- echo ''."\n";
+ $template->output .= ''."\n";
$start = get_moment();
$datas = array();
@@ -805,14 +805,14 @@ SELECT id
array_push($has_high_images, $row['id']);
}
}
-
+
foreach ( $files as $id=>$file )
{
$data = $site_reader->get_element_metadata(
$file,
in_array($id, $has_high_images)
);
-
+
if ( is_array($data) )
{
$data['date_metadata_update'] = CURRENT_DATE;
@@ -848,8 +848,6 @@ SELECT id
{
if (count($datas) > 0)
{
- // echo '', print_r($datas); echo '
';
-
mass_updates(
IMAGES_TABLE,
// fields
@@ -871,9 +869,9 @@ SELECT id
set_tags_of($tags_of);
}
- echo ''."\n";
+ $template->output .= ''."\n";
$template->assign_block_vars(
'metadata_result',
diff --git a/comments.php b/comments.php
index efcd7dfb5..e65662439 100644
--- a/comments.php
+++ b/comments.php
@@ -4,7 +4,6 @@
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
@@ -175,7 +174,6 @@ UPDATE '.COMMENTS_TABLE.'
$title= l10n('title_comments');
$page['body_id'] = 'theCommentsPage';
-include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->set_filenames(array('comments'=>'comments.tpl'));
$template->assign_vars(
@@ -442,7 +440,7 @@ SELECT id, name, permalink, uppercats
// +-----------------------------------------------------------------------+
// | html code display |
// +-----------------------------------------------------------------------+
-$template->assign_block_vars('title',array());
+include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->parse('comments');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
-?>
+?>
\ No newline at end of file
diff --git a/tags.php b/tags.php
index 8ed0e36c6..582d9d504 100644
--- a/tags.php
+++ b/tags.php
@@ -59,7 +59,6 @@ check_status(ACCESS_GUEST);
$title= l10n('Tags');
$page['body_id'] = 'theTagsPage';
-include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->set_filenames(array('tags'=>'tags.tpl'));
$template->assign_vars(
@@ -105,11 +104,7 @@ foreach ($tags as $tag)
);
}
-// +-----------------------------------------------------------------------+
-// | html code display |
-// +-----------------------------------------------------------------------+
-
-$template->assign_block_vars('title',array());
+include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->parse('tags');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
?>
\ No newline at end of file
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 08459ebb6..e4bda2bd7 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -117,4 +117,3 @@ A.navThumb, A.navThumb:hover {
}
.virtual_cat { background: #3f3f3f !important; }
-#mbMenu #quicksearch > p { text-align: left; }
diff --git a/tools/prototype.js b/tools/prototype.js
index 505822177..c5a9ccc05 100644
--- a/tools/prototype.js
+++ b/tools/prototype.js
@@ -1,2515 +1,3277 @@
-/* Prototype JavaScript framework, version 1.5.0
+/* Prototype JavaScript framework, version 1.5.1.1
* (c) 2005-2007 Sam Stephenson
*
* Prototype is freely distributable under the terms of an MIT-style license.
- * For details, see the Prototype web site: http://prototype.conio.net/
+ * For details, see the Prototype web site: http://www.prototypejs.org/
*
/*--------------------------------------------------------------------------*/
var Prototype = {
- Version: '1.5.0',
- BrowserFeatures: {
- XPath: !!document.evaluate
- },
+ Version: '1.5.1.1',
- ScriptFragment: '(?:)((\n|\r|.)*?)(?:<\/script>)',
- emptyFunction: function() {},
- K: function(x) { return x }
+ Browser: {
+ IE: !!(window.attachEvent && !window.opera),
+ Opera: !!window.opera,
+ WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+ Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1
+ },
+
+ BrowserFeatures: {
+ XPath: !!document.evaluate,
+ ElementExtensions: !!window.HTMLElement,
+ SpecificElementExtensions:
+ (document.createElement('div').__proto__ !==
+ document.createElement('form').__proto__)
+ },
+
+ ScriptFragment: '