diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_default.inc.php | 40 | ||||
| -rw-r--r-- | include/functions.inc.php | 6 | ||||
| -rw-r--r-- | include/functions_category.inc.php | 4 | ||||
| -rw-r--r-- | include/functions_cookie.inc.php | 4 | ||||
| -rw-r--r-- | include/functions_mail.inc.php | 10 | ||||
| -rw-r--r-- | include/functions_plugins.inc.php | 2 |
6 files changed, 33 insertions, 33 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 5d2e77aa3..cb78729ef 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -140,7 +140,7 @@ $conf['tn_width'] = 128; // tn_height : default height for thumbnails creation $conf['tn_height'] = 128; -// show_version : shall the version of PhpWebGallery be displayed at the +// show_version : shall the version of Piwigo be displayed at the // bottom of each page ? $conf['show_version'] = true; @@ -151,7 +151,7 @@ $conf['show_version'] = true; // Simple use: // for each link is associated a label // $conf['links'] = array( -// 'http://phpwebgallery.net' => 'PWG website', +// 'http://piwigo.org' => 'PWG website', // 'http://forum.phpwebgallery.net' => 'PWG forum', // 'http://phpwebgallery.net/doc' => 'PWG wiki' // ); @@ -160,7 +160,7 @@ $conf['show_version'] = true; // You can also used special options. Instead to pass a string like parameter value // you can pass a array with different optional parameter values // $conf['links'] = array( -// 'http://phpwebgallery.net' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'), +// 'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'), // 'http://forum.phpwebgallery.net' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'), // 'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'), // 'http://download.gna.org/phpwebgallery/' => @@ -185,10 +185,10 @@ $conf['show_version'] = true; // // Equivalence: // $conf['links'] = array( -// 'http://phpwebgallery.net' => 'PWG website', +// 'http://piwigo.org' => 'PWG website', // ); // $conf['links'] = array( -// 'http://phpwebgallery.net' => array('label' => 'PWG website', 'new_window' => false, 'visible' => 'return true;'), +// 'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'visible' => 'return true;'), // ); // // If the array is empty, the "Links" box won't be displayed on the main @@ -223,7 +223,7 @@ $conf['show_picture_name_on_title'] = true; // category. $conf['display_fromto'] = false; -// allow_random_representative : do you wish PhpWebGallery to search among +// allow_random_representative : do you wish Piwigo to search among // categories elements a new representative at each reload ? // // If false, an element is randomly or manually chosen to represent its @@ -321,9 +321,9 @@ $conf['show_iptc_mapping'] = array( // metadata $conf['use_iptc'] = false; -// use_iptc_mapping : in which IPTC fields will PhpWebGallery find image +// use_iptc_mapping : in which IPTC fields will Piwigo find image // information ? This setting is used during metadata synchronisation. It -// associates a phpwebgallery_images column name to a IPTC key +// associates a piwigo_images column name to a IPTC key $conf['use_iptc_mapping'] = array( 'keywords' => '2#025', 'date_creation' => '2#055', @@ -429,24 +429,24 @@ $conf['die_on_sql_error'] = true; $conf['apache_authentication'] = false; // users_table: which table is the reference for users? Can be a different -// table than PhpWebGallery table +// table than Piwigo table // // If you decide to use another table than the default one, you need to // prepare your database by deleting some datas : // -// delete from phpwebgallery_user_access; -// delete from phpwebgallery_user_cache; -// delete from phpwebgallery_user_feed; -// delete from phpwebgallery_user_group; -// delete from phpwebgallery_user_infos; -// delete from phpwebgallery_sessions; -// delete from phpwebgallery_rate; -// update phpwebgallery_images set average_rate = NULL; -// delete from phpwebgallery_caddie; -// delete from phpwebgallery_favorites; +// delete from piwigo_user_access; +// delete from piwigo_user_cache; +// delete from piwigo_user_feed; +// delete from piwigo_user_group; +// delete from piwigo_user_infos; +// delete from piwigo_sessions; +// delete from piwigo_rate; +// update piwigo_images set average_rate = null; +// delete from piwigo_caddie; +// delete from piwigo_favorites; // // All informations contained in these tables and column are related to -// phpwebgallery_users table. +// piwigo_users table. $conf['users_table'] = $prefixeTable.'users'; // Other tables can be changed, if you define associated constants diff --git a/include/functions.inc.php b/include/functions.inc.php index 13aa3d8f4..a1b589999 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -466,7 +466,7 @@ function str2url($str) return $res; } -//-------------------------------------------- PhpWebGallery specific functions +//-------------------------------------------- Piwigo specific functions /** * returns an array with a list of {language_code => language_name} @@ -913,7 +913,7 @@ function get_thumbnail_url($element_info) } /* returns the relative path of the thumnail with regards to to the root -of phpwebgallery (not the current page!).This function is not intended to be +of piwigo (not the current page!).This function is not intended to be called directly from code.*/ function get_thumbnail_location($element_info) { @@ -1391,7 +1391,7 @@ function get_pwg_charset() * * in descending order of preference: * param language, user language, default language - * PhpWebGallery default language. + * Piwigo default language. * * @param string filename * @param string dirname diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 94b2411d2..c647d19ef 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -188,7 +188,7 @@ SELECT * // get_complete_dir returns the concatenation of get_site_url and // get_local_dir // Example : "pets > rex > 1_year_old" is on the the same site as the -// PhpWebGallery files and this category has 22 for identifier +// Piwigo files and this category has 22 for identifier // get_complete_dir(22) returns "./galleries/pets/rex/1_year_old/" function get_complete_dir( $category_id ) { @@ -197,7 +197,7 @@ function get_complete_dir( $category_id ) // get_local_dir returns an array with complete path without the site url // Example : "pets > rex > 1_year_old" is on the the same site as the -// PhpWebGallery files and this category has 22 for identifier +// Piwigo files and this category has 22 for identifier // get_local_dir(22) returns "pets/rex/1_year_old/" function get_local_dir( $category_id ) { diff --git a/include/functions_cookie.inc.php b/include/functions_cookie.inc.php index cbb7c51bb..159a5b538 100644 --- a/include/functions_cookie.inc.php +++ b/include/functions_cookie.inc.php @@ -21,8 +21,8 @@ // | USA. | // +-----------------------------------------------------------------------+ -// cookie_path returns the path to use for the PhpWebGallery cookie. -// If PhpWebGallery is installed on : +// cookie_path returns the path to use for the Piwigo cookie. +// If Piwigo is installed on : // http://domain.org/meeting/gallery/category.php // cookie_path will return : "/meeting/gallery" function cookie_path() diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index 254a3b88f..9e7f9024d 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -67,7 +67,7 @@ function get_mail_sender_name() * - send_bcc_mail_webmaster: see $conf['send_bcc_mail_webmaster'] * - email_webmaster: mail corresponding to $conf['webmaster_id'] * - formated_email_webmaster: the name of webmaster is $conf['gallery_title'] - * - text_footer: PhpWebGallery and version + * - text_footer: Piwigo and version * * @return array */ @@ -522,7 +522,7 @@ WHERE } /* - * sends an email, using PhpWebGallery specific informations + * sends an email, using Piwigo specific informations * * @param: * - to: receiver(s) of the mail (list separated by comma). @@ -530,7 +530,7 @@ WHERE * o from: sender [default value webmaster email] * o Cc: array of carbon copy receivers of the mail. [default value empty] * o Bcc: array of blind carbon copy receivers of the mail. [default value empty] - * o subject [default value 'PhpWebGallery'] + * o subject [default value 'Piwigo'] * o content: content of mail [default value ''] * o content_format: format of mail content [default value 'text/plain'] * o email_format: global mail format [default value $conf_mail['default_email_format']] @@ -575,7 +575,7 @@ function pwg_mail($to, $args = array()) if (empty($args['subject'])) { - $args['subject'] = 'PhpWebGallery'; + $args['subject'] = 'Piwigo'; } // Spring cleaning $cvt_subject = trim(preg_replace('#[\n\r]+#s', '', $args['subject'])); @@ -751,7 +751,7 @@ function pwg_mail($to, $args = array()) * @param: * - result of other sendmail * - to: Receiver or receiver(s) of the mail. - * - subject [default value 'PhpWebGallery'] + * - subject [default value 'Piwigo'] * - content: content of mail * - headers: headers of mail * diff --git a/include/functions_plugins.inc.php b/include/functions_plugins.inc.php index f56e85137..e2beb18ac 100644 --- a/include/functions_plugins.inc.php +++ b/include/functions_plugins.inc.php @@ -22,7 +22,7 @@ // +-----------------------------------------------------------------------+ /* -Events and event handlers are the core of PhpWebGallery plugin management. +Events and event handlers are the core of Piwigo plugin management. Plugins are addons that are found in plugins subdirectory. If activated, PWG will include the index.php of each plugin. Events are triggered by PWG core code. Plugins (or even PWG itself) can |