aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin.php14
-rw-r--r--admin/site_update.php60
2 files changed, 36 insertions, 38 deletions
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&section=';
$title = l10n('PhpWebGallery Administration'); // for include/page_header.php
$page['page_banner'] = '<h1>'.l10n('PhpWebGallery Administration').'</h1>';
$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 "<br>";
// 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 '<!-- scanning dirs : ';
- echo get_elapsed_time($start, get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- scanning dirs : '
+ . get_elapsed_time($start, get_moment())
+ . ' -->'."\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 "<br>";
- echo '<!-- get_elements: '.get_elapsed_time($start, get_moment())." -->\n";
+ $template->output .= '<!-- get_elements: '
+ . get_elapsed_time($start, get_moment())
+ . " -->\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 '<!-- scanning files : ';
- echo get_elapsed_time($start_files, get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- scanning files : '
+ . get_elapsed_time($start_files, get_moment())
+ . ' -->'."\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 '<!-- update_category(all) : ';
- echo get_elapsed_time($start,get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- update_category(all) : '
+ . get_elapsed_time($start,get_moment())
+ . ' -->'."\n";
$start = get_moment();
ordering();
update_global_rank();
- echo '<!-- ordering categories : ';
- echo get_elapsed_time($start, get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- ordering categories : '
+ . get_elapsed_time($start, get_moment())
+ . ' -->'."\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 '<!-- get_filelist : ';
- echo get_elapsed_time($start, get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- get_filelist : '
+ . get_elapsed_time($start, get_moment())
+ . ' -->'."\n";
$start = get_moment();
$datas = array();
@@ -716,9 +716,9 @@ if (isset($_POST['submit'])
$datas
);
}
- echo '<!-- update files : ';
- echo get_elapsed_time($start,get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- update files : '
+ . get_elapsed_time($start,get_moment())
+ . ' -->'."\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 '<!-- get_filelist : ';
- echo get_elapsed_time($start, get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- get_filelist : '
+ . get_elapsed_time($start, get_moment())
+ . ' -->'."\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 '<pre>', print_r($datas); echo '</pre>';
-
mass_updates(
IMAGES_TABLE,
// fields
@@ -871,9 +869,9 @@ SELECT id
set_tags_of($tags_of);
}
- echo '<!-- metadata update : ';
- echo get_elapsed_time($start, get_moment());
- echo ' -->'."\n";
+ $template->output .= '<!-- metadata update : '
+ . get_elapsed_time($start, get_moment())
+ . ' -->'."\n";
$template->assign_block_vars(
'metadata_result',