diff --git a/admin.php b/admin.php index ac89babdd..b5f6cffae 100644 --- a/admin.php +++ b/admin.php @@ -219,6 +219,7 @@ SELECT COUNT(*) if ($nb_comments > 0) { $template->assign('NB_PENDING_COMMENTS', $nb_comments); + $page['nb_pending_comments'] = $nb_comments; } } diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php index 9cef0f064..c6e2ac734 100644 --- a/admin/include/add_core_tabs.inc.php +++ b/admin/include/add_core_tabs.inc.php @@ -27,6 +27,10 @@ function add_core_tabs($sheets, $tab_id) { switch($tab_id) { + case 'admin_home': + $sheets[''] = array('caption' => l10n('Administration Home'), 'url' => 'admin.php'); + break; + case 'album': global $admin_album_base_url; $sheets['properties'] = array('caption' => ''.l10n('Properties'), 'url' => $admin_album_base_url.'-properties'); diff --git a/admin/include/functions.php b/admin/include/functions.php index 030e7fa31..9f8b6a6f8 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -3006,3 +3006,29 @@ UPDATE '.IMAGES_TABLE.' ;'; pwg_query($query); } + +/** + * Get a more human friendly representation of big numbers. Like 17.8k instead of 17832 + * + * @since 2.9 + * @param float $numbers + */ +function number_format_human_readable($numbers) +{ + $readable = array("", "k", "M"); + $index = 0; + + while ($numbers >= 1000) + { + $numbers /= 1000; + $index++; + + if ($index > count($readable) - 1) + { + $index--; + break; + } + } + + return number_format($numbers, 1).$readable[$index]; +} diff --git a/admin/intro.php b/admin/intro.php index 96b07d2a8..39f52e9d9 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -29,13 +29,26 @@ if (!defined('PHPWG_ROOT_PATH')) include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'admin/include/check_integrity.class.php'); include_once(PHPWG_ROOT_PATH.'admin/include/c13y_internal.class.php'); -include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php'); // +-----------------------------------------------------------------------+ // | Check Access and exit when user status is not ok | // +-----------------------------------------------------------------------+ + check_status(ACCESS_ADMINISTRATOR); +// +-----------------------------------------------------------------------+ +// | tabs | +// +-----------------------------------------------------------------------+ + +include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); + +$my_base_url = get_root_url().'admin.php?page='; + +$tabsheet = new tabsheet(); +$tabsheet->set_id('admin_home'); +$tabsheet->select(''); +$tabsheet->assign(); + // +-----------------------------------------------------------------------+ // | actions | // +-----------------------------------------------------------------------+ @@ -91,11 +104,15 @@ if (isset($_GET['action']) and 'check_upgrade' == $_GET['action']) } } } -// Show phpinfo() output -else if (isset($_GET['action']) and 'phpinfo' == $_GET['action']) + +if (isset($page['nb_pending_comments'])) { - phpinfo(); - exit(); + $message = l10n('User comments').' '; + $message.= ''; + $message.= l10n('%d waiting for validation', $page['nb_pending_comments']); + $message.= ' '; + + $page['messages'][] = $message; } // +-----------------------------------------------------------------------+ @@ -113,9 +130,6 @@ if ($conf['show_newsletter_subscription']) { ); } -$php_current_timestamp = date("Y-m-d H:i:s"); -$db_version = pwg_get_db_version(); -list($db_current_date) = pwg_db_fetch_row(pwg_query('SELECT now();')); $query = ' SELECT COUNT(*) @@ -129,26 +143,6 @@ SELECT COUNT(*) ;'; list($nb_categories) = pwg_db_fetch_row(pwg_query($query)); -$query = ' -SELECT COUNT(*) - FROM '.CATEGORIES_TABLE.' - WHERE dir IS NULL -;'; -list($nb_virtual) = pwg_db_fetch_row(pwg_query($query)); - -$query = ' -SELECT COUNT(*) - FROM '.CATEGORIES_TABLE.' - WHERE dir IS NOT NULL -;'; -list($nb_physical) = pwg_db_fetch_row(pwg_query($query)); - -$query = ' -SELECT COUNT(*) - FROM '.IMAGE_CATEGORY_TABLE.' -;'; -list($nb_image_category) = pwg_db_fetch_row(pwg_query($query)); - $query = ' SELECT COUNT(*) FROM '.TAGS_TABLE.' @@ -179,32 +173,46 @@ SELECT COUNT(*) ;'; list($nb_rates) = pwg_db_fetch_row(pwg_query($query)); +$query = ' +SELECT + SUM(nb_pages) + FROM '.HISTORY_SUMMARY_TABLE.' + WHERE month IS NULL +;'; +list($nb_views) = pwg_db_fetch_row(pwg_query($query)); + +$query = ' +SELECT + SUM(filesize) + FROM '.IMAGES_TABLE.' +;'; +list($disk_usage) = pwg_db_fetch_row(pwg_query($query)); + +$query = ' +SELECT + SUM(filesize) + FROM '.IMAGE_FORMAT_TABLE.' +;'; +list($formats_disk_usage) = pwg_db_fetch_row(pwg_query($query)); + +$disk_usage+= $formats_disk_usage; + $template->assign( array( - 'PHPWG_URL' => PHPWG_URL, - 'PWG_VERSION' => PHPWG_VERSION, - 'OS' => PHP_OS, - 'PHP_VERSION' => phpversion(), - 'DB_ENGINE' => 'MySQL', - 'DB_VERSION' => $db_version, - 'DB_ELEMENTS' => l10n_dec('%d photo', '%d photos', $nb_elements), - 'DB_CATEGORIES' => - l10n_dec('%d album including', '%d albums including', $nb_categories). - l10n_dec('%d physical', '%d physicals', $nb_physical). - l10n_dec(' and %d virtual', ' and %d virtuals', $nb_virtual), - 'DB_IMAGE_CATEGORY' => l10n_dec('%d association', '%d associations', $nb_image_category), - 'DB_TAGS' => l10n_dec('%d tag', '%d tags', $nb_tags), - 'DB_IMAGE_TAG' => l10n_dec('%d association', '%d associations', $nb_image_tag), - 'DB_USERS' => l10n_dec('%d user', '%d users', $nb_users), - 'DB_GROUPS' => l10n_dec('%d group', '%d groups', $nb_groups), - 'DB_RATES' => ($nb_rates == 0) ? l10n('no rate') : l10n('%d rates', $nb_rates), + 'NB_PHOTOS' => number_format($nb_elements, 0, '.', ','), + 'NB_ALBUMS' => $nb_categories, + 'NB_TAGS' => $nb_tags, + 'NB_IMAGE_TAG' => $nb_image_tag, + 'NB_USERS' => $nb_users, + 'NB_GROUPS' => $nb_groups, + 'NB_RATES' => $nb_rates, + 'NB_VIEWS' => number_format_human_readable($nb_views), + 'NB_PLUGINS' => count($pwg_loaded_plugins), + 'STORAGE_USED' => l10n('%sGB', number_format($disk_usage/(1024*1024), 1)), 'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade', - 'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo', - 'PHP_DATATIME' => $php_current_timestamp, - 'DB_DATATIME' => $db_current_date, ) ); - + if ($conf['activate_comments']) { $query = ' @@ -212,7 +220,7 @@ SELECT COUNT(*) FROM '.COMMENTS_TABLE.' ;'; list($nb_comments) = pwg_db_fetch_row(pwg_query($query)); - $template->assign('DB_COMMENTS', l10n_dec('%d comment', '%d comments', $nb_comments)); + $template->assign('NB_COMMENTS', $nb_comments); } if ($nb_elements > 0) @@ -224,44 +232,13 @@ SELECT MIN(date_available) list($first_date) = pwg_db_fetch_row(pwg_query($query)); $template->assign( - 'first_added', array( - 'DB_DATE' => - l10n('first photo added on %s', format_date($first_date)) + 'first_added_date' => format_date($first_date), + 'first_added_age' => time_since($first_date, 'year', null, false, false), ) ); } -// graphics library -switch (pwg_image::get_library()) -{ - case 'imagick': - $library = 'ImageMagick'; - $img = new Imagick(); - $version = $img->getVersion(); - if (preg_match('/ImageMagick \d+\.\d+\.\d+-?\d*/', $version['versionString'], $match)) - { - $library = $match[0]; - } - $template->assign('GRAPHICS_LIBRARY', $library); - break; - - case 'ext_imagick': - $library = 'External ImageMagick'; - exec($conf['ext_imagick_dir'].'convert -version', $returnarray); - if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match)) - { - $library .= ' ' . $match[1]; - } - $template->assign('GRAPHICS_LIBRARY', $library); - break; - - case 'gd': - $gd_info = gd_info(); - $template->assign('GRAPHICS_LIBRARY', 'GD '.@$gd_info['GD Version']); - break; -} - // +-----------------------------------------------------------------------+ // | sending html code | // +-----------------------------------------------------------------------+ diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl index 02e00769b..0a76081e0 100644 --- a/admin/themes/default/template/intro.tpl +++ b/admin/themes/default/template/intro.tpl @@ -1,8 +1,10 @@ +{include file='include/colorbox.inc.tpl'} + {combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'} {footer_script require='jquery.cluetip'} -var piwigo_need_update_msg = '{'A new version of Piwigo is available.'|@translate|@escape:"javascript"}'; -var ext_need_update_msg = '{'Some upgrades are available for extensions.'|@translate|@escape:"javascript"}'; +var piwigo_need_update_msg = '{'A new version of Piwigo is available.'|@translate|@escape:"javascript"} '; +var ext_need_update_msg = '{'Some upgrades are available for extensions.'|@translate|@escape:"javascript"} '; {literal} jQuery().ready(function(){ @@ -23,7 +25,7 @@ jQuery().ready(function(){ piwigo_update = data['result']['piwigo_need_update']; ext_update = data['result']['ext_need_update'] if ((piwigo_update || ext_update) && !jQuery(".warnings").is('div')) - jQuery("#content").prepend('
'); + jQuery(".eiw").prepend('
'); if (piwigo_update) jQuery(".warnings ul").append('
  • '+piwigo_need_update_msg+'
    • '); if (ext_update) @@ -34,12 +36,114 @@ jQuery().ready(function(){ {/literal} {/footer_script} +{html_style} +.stat-boxes { + text-align:left; + margin:10px; +} + +.stat-box { + display:inline-block; + width:200px; + margin:10px; + cursor:help; +} + +.stat-box:hover { + color:#ff7700; +} + +.stat-box i { + font-size:50px; + float:left; + margin-right:5px; +} + +.stat-box .number, .stat-box .caption { + display:inline-block; + width:120px; + text-align:left; +} + +.stat-box .number { + margin-top:10px; + font-size:20px; +} + +.eiw .messages ul li { + list-style-type:none !important; +} + +.eiw .messages .eiw-icon { + margin-right:10px !important; +} +{/html_style} +

    {'Piwigo Administration'|@translate}

    + +
    + +
    + +{$NB_PHOTOS}{'Photos'|translate} +
    + +
    + +{$NB_ALBUMS}{'Albums'|translate} +
    + +
    + +{$NB_TAGS}{'Tags'|translate} +
    + +
    + +{$NB_USERS}{'Users'|translate} +
    + +
    + +{$NB_GROUPS}{'Groups'|translate} +
    + +
    + +{$NB_COMMENTS}{'Comments'|translate} +
    + +
    + +{$NB_RATES}{'Rating'|translate} +
    + +
    + +{$NB_VIEWS}{'Pages seen'|translate} +
    + +
    + +{$NB_PLUGINS}{'Plugins'|translate} +
    + +
    + +{$STORAGE_USED}{'Storage used'|translate} +
    + +
    + +{$first_added_age}{'First photo added'|translate} +
    + +
    {* .stat-boxes *} +
    {'Piwigo version'|@translate}
    -
    {'Environment'|@translate}
    -
    - -
    - -
    {'Database'|@translate}
    -
    - -
    {if $ENABLE_SYNCHRONIZATION} @@ -98,4 +169,4 @@ jQuery().ready(function(){ -{/if} \ No newline at end of file +{/if}