diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/cat_options.php | 2 | ||||
| -rw-r--r-- | admin/include/functions.php | 8 | ||||
| -rw-r--r-- | admin/include/functions_upgrade.php | 4 | ||||
| -rw-r--r-- | admin/ws_checker.php | 28 |
4 files changed, 21 insertions, 21 deletions
diff --git a/admin/cat_options.php b/admin/cat_options.php index ca07d37a3..810534f0b 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -128,7 +128,7 @@ UPDATE '.CATEGORIES_TABLE.' case 'representative' : { // theoretically, all categories in $_POST['cat_false'] contain at - // least one element, so PhpWebGallery can find a representant. + // least one element, so Piwigo can find a representant. set_random_representant($_POST['cat_false']); break; } diff --git a/admin/include/functions.php b/admin/include/functions.php index 0bf9db6f0..ef6449347 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -220,7 +220,7 @@ function delete_user($user_id) FAVORITES_TABLE, // destruction of the caddie associated with the user CADDIE_TABLE, - // deletion of phpwebgallery specific informations + // deletion of piwigo specific informations USER_INFOS_TABLE, ); @@ -1694,11 +1694,11 @@ SELECT image_id } /** - * Create an XML file with PhpWebGallery informations about a list of + * Create an XML file with Piwigo informations about a list of * pictures. * * The goal of the export feature is to make easier the reading of - * informations related to pictures outside of PhpWebGallery. + * informations related to pictures outside of Piwigo. * * @param array image_ids */ @@ -1785,7 +1785,7 @@ SELECT id, } /** - * Refer main PhpWebGallery URLs (currently PHPWG_DOMAIN domain) + * Refer main Piwigo URLs (currently PHPWG_DOMAIN domain) * * @param void * @return array like $conf['links'] diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index ac058294f..7e9a93aef 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -23,10 +23,10 @@ function check_upgrade() { - // Is PhpWebGallery already installed ? + // Is Piwigo already installed ? if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE) { - $message = 'PhpWebGallery is not in upgrade mode. In include/mysql.inc.php, + $message = 'Piwigo is not in upgrade mode. In include/mysql.inc.php, insert line <pre style="background-color:lightgray"> define(\'PHPWG_IN_UPGRADE\', true); diff --git a/admin/ws_checker.php b/admin/ws_checker.php index 00a2f68a4..7da8fac10 100644 --- a/admin/ws_checker.php +++ b/admin/ws_checker.php @@ -293,29 +293,29 @@ if ( $chk_partner !== '' ) $status_code = array(); preg_match('/\d\d\d/', $response, $status_code); switch( $status_code[0] ) { - case 200: + case 200: $ws_status = l10n('Web Services under control'); - break; - case 503: - $ws_status = 'PhpWebGallery Web Services failed and returned an ' + break; + case 503: + $ws_status = 'Piwigo Web Services failed and returned an ' . 'HTTP status of 503. Service is unavailable. An internal ' . 'problem prevented us from returning data to you.'; - break; - case 403: - $ws_status = 'PhpWebGallery Web Services failed and returned an ' + break; + case 403: + $ws_status = 'Piwigo Web Services failed and returned an ' . 'HTTP status of 403. Access is forbidden. You do not have ' . 'permission to access this resource, or are over ' . 'your rate limit.'; - break; - case 400: - // You may want to fall through here and read the specific XML error - $ws_status = 'PhpWebGallery Web Services failed and returned an ' + break; + case 400: + // You may want to fall through here and read the specific XML error + $ws_status = 'Piwigo Web Services failed and returned an ' . 'HTTP status of 400. Bad request. The parameters passed ' . 'to the service did not match as expected. The exact ' . 'error is returned in the XML response.'; - break; - default: - $ws_status = 'PhpWebGallery Web Services returned an unexpected HTTP ' + break; + default: + $ws_status = 'Piwigo Web Services returned an unexpected HTTP ' . 'status of:' . $status_code[0]; } } |