diff options
| -rw-r--r-- | admin.php | 2 | ||||
| -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 | ||||
| -rw-r--r-- | feed.php | 4 | ||||
| -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 | ||||
| -rw-r--r-- | install.php | 10 | ||||
| -rw-r--r-- | install/piwigo_structure.sql (renamed from install/phpwebgallery_structure.sql) | 180 | ||||
| -rw-r--r-- | install/upgrade_1.4.0.php | 42 | ||||
| -rw-r--r-- | tools/create_listing_file.php | 20 |
16 files changed, 183 insertions, 183 deletions
@@ -135,7 +135,7 @@ if (count($page['infos']) != 0) $template->assign('infos', $page['infos']); } -// Add the PhpWebGallery Official menu +// Add the Piwigo Official menu $template->assign( 'pwgmenu', pwg_URL() ); include(PHPWG_ROOT_PATH.'include/page_header.php'); 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]; } } @@ -136,7 +136,7 @@ if (!$image_only) $item->descriptionHtmlSyndicated = true; $item->date = mysqldt_to_ts($dbnow); - $item->author = 'PhpWebGallery notifier'; + $item->author = 'Piwigo notifier'; $item->guid= sprintf('%s', $dbnow);; $rss->addItem($item); @@ -188,7 +188,7 @@ foreach($dates as $date_detail) $item->descriptionHtmlSyndicated = true; $item->date = mysqldt_to_ts($date); - $item->author = 'PhpWebGallery notifier'; + $item->author = 'Piwigo notifier'; $item->guid= sprintf('%s', 'pics-'.$date);; $rss->addItem($item); 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 diff --git a/install.php b/install.php index 87376ddf9..a1c737c56 100644 --- a/install.php +++ b/install.php @@ -142,7 +142,7 @@ if( !get_magic_quotes_gpc() ) //----------------------------------------------------- variable initialization -define('DEFAULT_PREFIX_TABLE', 'phpwebgallery_'); +define('DEFAULT_PREFIX_TABLE', 'piwigo_'); // Obtain various vars $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost'; @@ -172,10 +172,10 @@ $config_file = PHPWG_ROOT_PATH.'include/mysql.inc.php'; if (@file_exists($config_file)) { include($config_file); - // Is PhpWebGallery already installed ? + // Is Piwigo already installed ? if (defined("PHPWG_INSTALLED")) { - die('PhpWebGallery is already installed'); + die('Piwigo is already installed'); } } @@ -299,9 +299,9 @@ define(\'DB_COLLATE\', \'\'); // Create empty local files to avoid log errors create_empty_local_files(); - // tables creation, based on phpwebgallery_structure.sql + // tables creation, based on piwigo_structure.sql execute_sqlfile( - PHPWG_ROOT_PATH.'install/phpwebgallery_structure.sql', + PHPWG_ROOT_PATH.'install/piwigo_structure.sql', DEFAULT_PREFIX_TABLE, $table_prefix ); diff --git a/install/phpwebgallery_structure.sql b/install/piwigo_structure.sql index f34b2f571..aa290149f 100644 --- a/install/phpwebgallery_structure.sql +++ b/install/piwigo_structure.sql @@ -5,22 +5,22 @@ -- Server version 4.0.24_Debian-10-log -- --- Table structure for table `phpwebgallery_caddie` +-- Table structure for table `piwigo_caddie` -- -DROP TABLE IF EXISTS `phpwebgallery_caddie`; -CREATE TABLE `phpwebgallery_caddie` ( +DROP TABLE IF EXISTS `piwigo_caddie`; +CREATE TABLE `piwigo_caddie` ( `user_id` smallint(5) NOT NULL default '0', `element_id` mediumint(8) NOT NULL default '0', PRIMARY KEY (`user_id`,`element_id`) ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_categories` +-- Table structure for table `piwigo_categories` -- -DROP TABLE IF EXISTS `phpwebgallery_categories`; -CREATE TABLE `phpwebgallery_categories` ( +DROP TABLE IF EXISTS `piwigo_categories`; +CREATE TABLE `piwigo_categories` ( `id` smallint(5) unsigned NOT NULL auto_increment, `name` varchar(255) NOT NULL default '', `id_uppercat` smallint(5) unsigned default NULL, @@ -43,11 +43,11 @@ CREATE TABLE `phpwebgallery_categories` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_comments` +-- Table structure for table `piwigo_comments` -- -DROP TABLE IF EXISTS `phpwebgallery_comments`; -CREATE TABLE `phpwebgallery_comments` ( +DROP TABLE IF EXISTS `piwigo_comments`; +CREATE TABLE `piwigo_comments` ( `id` int(11) unsigned NOT NULL auto_increment, `image_id` mediumint(8) unsigned NOT NULL default '0', `date` datetime NOT NULL default '0000-00-00 00:00:00', @@ -61,11 +61,11 @@ CREATE TABLE `phpwebgallery_comments` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_config` +-- Table structure for table `piwigo_config` -- -DROP TABLE IF EXISTS `phpwebgallery_config`; -CREATE TABLE `phpwebgallery_config` ( +DROP TABLE IF EXISTS `piwigo_config`; +CREATE TABLE `piwigo_config` ( `param` varchar(40) NOT NULL default '', `value` text, `comment` varchar(255) default NULL, @@ -73,33 +73,33 @@ CREATE TABLE `phpwebgallery_config` ( ) TYPE=MyISAM COMMENT='configuration table'; -- --- Table structure for table `phpwebgallery_favorites` +-- Table structure for table `piwigo_favorites` -- -DROP TABLE IF EXISTS `phpwebgallery_favorites`; -CREATE TABLE `phpwebgallery_favorites` ( +DROP TABLE IF EXISTS `piwigo_favorites`; +CREATE TABLE `piwigo_favorites` ( `user_id` smallint(5) NOT NULL default '0', `image_id` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`user_id`,`image_id`) ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_group_access` +-- Table structure for table `piwigo_group_access` -- -DROP TABLE IF EXISTS `phpwebgallery_group_access`; -CREATE TABLE `phpwebgallery_group_access` ( +DROP TABLE IF EXISTS `piwigo_group_access`; +CREATE TABLE `piwigo_group_access` ( `group_id` smallint(5) unsigned NOT NULL default '0', `cat_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`group_id`,`cat_id`) ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_groups` +-- Table structure for table `piwigo_groups` -- -DROP TABLE IF EXISTS `phpwebgallery_groups`; -CREATE TABLE `phpwebgallery_groups` ( +DROP TABLE IF EXISTS `piwigo_groups`; +CREATE TABLE `piwigo_groups` ( `id` smallint(5) unsigned NOT NULL auto_increment, `name` varchar(255) NOT NULL default '', `is_default` enum('true','false') NOT NULL default 'false', @@ -108,11 +108,11 @@ CREATE TABLE `phpwebgallery_groups` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_history` +-- Table structure for table `piwigo_history` -- -DROP TABLE IF EXISTS `phpwebgallery_history`; -CREATE TABLE `phpwebgallery_history` ( +DROP TABLE IF EXISTS `piwigo_history`; +CREATE TABLE `piwigo_history` ( `id` int(10) unsigned NOT NULL auto_increment, `date` date NOT NULL default '0000-00-00', `time` time NOT NULL default '00:00:00', @@ -129,11 +129,11 @@ CREATE TABLE `phpwebgallery_history` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_history_summary` +-- Table structure for table `piwigo_history_summary` -- -DROP TABLE IF EXISTS `phpwebgallery_history_summary`; -CREATE TABLE `phpwebgallery_history_summary` ( +DROP TABLE IF EXISTS `piwigo_history_summary`; +CREATE TABLE `piwigo_history_summary` ( `year` smallint(4) NOT NULL default '0', `month` tinyint(2) default NULL, `day` tinyint(2) default NULL, @@ -143,11 +143,11 @@ CREATE TABLE `phpwebgallery_history_summary` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_image_category` +-- Table structure for table `piwigo_image_category` -- -DROP TABLE IF EXISTS `phpwebgallery_image_category`; -CREATE TABLE `phpwebgallery_image_category` ( +DROP TABLE IF EXISTS `piwigo_image_category`; +CREATE TABLE `piwigo_image_category` ( `image_id` mediumint(8) unsigned NOT NULL default '0', `category_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`image_id`,`category_id`), @@ -155,11 +155,11 @@ CREATE TABLE `phpwebgallery_image_category` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_image_tag` +-- Table structure for table `piwigo_image_tag` -- -DROP TABLE IF EXISTS `phpwebgallery_image_tag`; -CREATE TABLE `phpwebgallery_image_tag` ( +DROP TABLE IF EXISTS `piwigo_image_tag`; +CREATE TABLE `piwigo_image_tag` ( `image_id` mediumint(8) unsigned NOT NULL default '0', `tag_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`image_id`,`tag_id`), @@ -167,11 +167,11 @@ CREATE TABLE `phpwebgallery_image_tag` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_images` +-- Table structure for table `piwigo_images` -- -DROP TABLE IF EXISTS `phpwebgallery_images`; -CREATE TABLE `phpwebgallery_images` ( +DROP TABLE IF EXISTS `piwigo_images`; +CREATE TABLE `piwigo_images` ( `id` mediumint(8) unsigned NOT NULL auto_increment, `file` varchar(255) NOT NULL default '', `date_available` datetime NOT NULL default '0000-00-00 00:00:00', @@ -201,11 +201,11 @@ CREATE TABLE `phpwebgallery_images` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_old_permalinks` +-- Table structure for table `piwigo_old_permalinks` -- -DROP TABLE IF EXISTS `phpwebgallery_old_permalinks`; -CREATE TABLE `phpwebgallery_old_permalinks` ( +DROP TABLE IF EXISTS `piwigo_old_permalinks`; +CREATE TABLE `piwigo_old_permalinks` ( `cat_id` smallint(5) unsigned NOT NULL default '0', `permalink` varchar(64) NOT NULL default '', `date_deleted` datetime NOT NULL default '0000-00-00 00:00:00', @@ -215,11 +215,11 @@ CREATE TABLE `phpwebgallery_old_permalinks` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_plugins` +-- Table structure for table `piwigo_plugins` -- -DROP TABLE IF EXISTS `phpwebgallery_plugins`; -CREATE TABLE `phpwebgallery_plugins` ( +DROP TABLE IF EXISTS `piwigo_plugins`; +CREATE TABLE `piwigo_plugins` ( `id` varchar(64) binary NOT NULL default '', `state` enum('inactive','active') NOT NULL default 'inactive', `version` varchar(64) NOT NULL default '0', @@ -227,11 +227,11 @@ CREATE TABLE `phpwebgallery_plugins` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_rate` +-- Table structure for table `piwigo_rate` -- -DROP TABLE IF EXISTS `phpwebgallery_rate`; -CREATE TABLE `phpwebgallery_rate` ( +DROP TABLE IF EXISTS `piwigo_rate`; +CREATE TABLE `piwigo_rate` ( `user_id` smallint(5) NOT NULL default '0', `element_id` mediumint(8) unsigned NOT NULL default '0', `anonymous_id` varchar(45) NOT NULL default '', @@ -241,11 +241,11 @@ CREATE TABLE `phpwebgallery_rate` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_search` +-- Table structure for table `piwigo_search` -- -DROP TABLE IF EXISTS `phpwebgallery_search`; -CREATE TABLE `phpwebgallery_search` ( +DROP TABLE IF EXISTS `piwigo_search`; +CREATE TABLE `piwigo_search` ( `id` int(10) unsigned NOT NULL auto_increment, `last_seen` date default NULL, `rules` text, @@ -253,11 +253,11 @@ CREATE TABLE `phpwebgallery_search` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_sessions` +-- Table structure for table `piwigo_sessions` -- -DROP TABLE IF EXISTS `phpwebgallery_sessions`; -CREATE TABLE `phpwebgallery_sessions` ( +DROP TABLE IF EXISTS `piwigo_sessions`; +CREATE TABLE `piwigo_sessions` ( `id` varchar(255) binary NOT NULL default '', `data` mediumtext NOT NULL, `expiration` datetime NOT NULL default '0000-00-00 00:00:00', @@ -265,11 +265,11 @@ CREATE TABLE `phpwebgallery_sessions` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_sites` +-- Table structure for table `piwigo_sites` -- -DROP TABLE IF EXISTS `phpwebgallery_sites`; -CREATE TABLE `phpwebgallery_sites` ( +DROP TABLE IF EXISTS `piwigo_sites`; +CREATE TABLE `piwigo_sites` ( `id` tinyint(4) NOT NULL auto_increment, `galleries_url` varchar(255) NOT NULL default '', PRIMARY KEY (`id`), @@ -277,11 +277,11 @@ CREATE TABLE `phpwebgallery_sites` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_tags` +-- Table structure for table `piwigo_tags` -- -DROP TABLE IF EXISTS `phpwebgallery_tags`; -CREATE TABLE `phpwebgallery_tags` ( +DROP TABLE IF EXISTS `piwigo_tags`; +CREATE TABLE `piwigo_tags` ( `id` smallint(5) unsigned NOT NULL auto_increment, `name` varchar(255) binary NOT NULL default '', `url_name` varchar(255) binary NOT NULL default '', @@ -290,11 +290,11 @@ CREATE TABLE `phpwebgallery_tags` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_upgrade` +-- Table structure for table `piwigo_upgrade` -- -DROP TABLE IF EXISTS `phpwebgallery_upgrade`; -CREATE TABLE `phpwebgallery_upgrade` ( +DROP TABLE IF EXISTS `piwigo_upgrade`; +CREATE TABLE `piwigo_upgrade` ( `id` varchar(20) NOT NULL default '', `applied` datetime NOT NULL default '0000-00-00 00:00:00', `description` varchar(255) default NULL, @@ -302,22 +302,22 @@ CREATE TABLE `phpwebgallery_upgrade` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_access` +-- Table structure for table `piwigo_user_access` -- -DROP TABLE IF EXISTS `phpwebgallery_user_access`; -CREATE TABLE `phpwebgallery_user_access` ( +DROP TABLE IF EXISTS `piwigo_user_access`; +CREATE TABLE `piwigo_user_access` ( `user_id` smallint(5) NOT NULL default '0', `cat_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`user_id`,`cat_id`) ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_cache` +-- Table structure for table `piwigo_user_cache` -- -DROP TABLE IF EXISTS `phpwebgallery_user_cache`; -CREATE TABLE `phpwebgallery_user_cache` ( +DROP TABLE IF EXISTS `piwigo_user_cache`; +CREATE TABLE `piwigo_user_cache` ( `user_id` smallint(5) NOT NULL default '0', `need_update` enum('true','false') NOT NULL default 'true', `forbidden_categories` mediumtext, @@ -328,11 +328,11 @@ CREATE TABLE `phpwebgallery_user_cache` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_cache_categories` +-- Table structure for table `piwigo_user_cache_categories` -- -DROP TABLE IF EXISTS `phpwebgallery_user_cache_categories`; -CREATE TABLE `phpwebgallery_user_cache_categories` ( +DROP TABLE IF EXISTS `piwigo_user_cache_categories`; +CREATE TABLE `piwigo_user_cache_categories` ( `user_id` smallint(5) NOT NULL default '0', `cat_id` smallint(5) unsigned NOT NULL default '0', `date_last` datetime default NULL, @@ -344,11 +344,11 @@ CREATE TABLE `phpwebgallery_user_cache_categories` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_feed` +-- Table structure for table `piwigo_user_feed` -- -DROP TABLE IF EXISTS `phpwebgallery_user_feed`; -CREATE TABLE `phpwebgallery_user_feed` ( +DROP TABLE IF EXISTS `piwigo_user_feed`; +CREATE TABLE `piwigo_user_feed` ( `id` varchar(50) binary NOT NULL default '', `user_id` smallint(5) NOT NULL default '0', `last_check` datetime default NULL, @@ -356,22 +356,22 @@ CREATE TABLE `phpwebgallery_user_feed` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_group` +-- Table structure for table `piwigo_user_group` -- -DROP TABLE IF EXISTS `phpwebgallery_user_group`; -CREATE TABLE `phpwebgallery_user_group` ( +DROP TABLE IF EXISTS `piwigo_user_group`; +CREATE TABLE `piwigo_user_group` ( `user_id` smallint(5) NOT NULL default '0', `group_id` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`group_id`,`user_id`) ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_infos` +-- Table structure for table `piwigo_user_infos` -- -DROP TABLE IF EXISTS `phpwebgallery_user_infos`; -CREATE TABLE `phpwebgallery_user_infos` ( +DROP TABLE IF EXISTS `piwigo_user_infos`; +CREATE TABLE `piwigo_user_infos` ( `user_id` smallint(5) NOT NULL default '0', `nb_image_line` tinyint(1) unsigned NOT NULL default '5', `nb_line_page` tinyint(3) unsigned NOT NULL default '3', @@ -392,11 +392,11 @@ CREATE TABLE `phpwebgallery_user_infos` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_user_mail_notification` +-- Table structure for table `piwigo_user_mail_notification` -- -DROP TABLE IF EXISTS `phpwebgallery_user_mail_notification`; -CREATE TABLE `phpwebgallery_user_mail_notification` ( +DROP TABLE IF EXISTS `piwigo_user_mail_notification`; +CREATE TABLE `piwigo_user_mail_notification` ( `user_id` smallint(5) NOT NULL default '0', `check_key` varchar(16) binary NOT NULL default '', `enabled` enum('true','false') NOT NULL default 'false', @@ -406,11 +406,11 @@ CREATE TABLE `phpwebgallery_user_mail_notification` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_users` +-- Table structure for table `piwigo_users` -- -DROP TABLE IF EXISTS `phpwebgallery_users`; -CREATE TABLE `phpwebgallery_users` ( +DROP TABLE IF EXISTS `piwigo_users`; +CREATE TABLE `piwigo_users` ( `id` smallint(5) NOT NULL auto_increment, `username` varchar(100) binary NOT NULL default '', `password` varchar(32) default NULL, @@ -420,11 +420,11 @@ CREATE TABLE `phpwebgallery_users` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_waiting` +-- Table structure for table `piwigo_waiting` -- -DROP TABLE IF EXISTS `phpwebgallery_waiting`; -CREATE TABLE `phpwebgallery_waiting` ( +DROP TABLE IF EXISTS `piwigo_waiting`; +CREATE TABLE `piwigo_waiting` ( `id` int(10) unsigned NOT NULL auto_increment, `storage_category_id` smallint(5) unsigned NOT NULL default '0', `file` varchar(255) NOT NULL default '', @@ -438,11 +438,11 @@ CREATE TABLE `phpwebgallery_waiting` ( ) TYPE=MyISAM; -- --- Table structure for table `phpwebgallery_ws_access` +-- Table structure for table `piwigo_ws_access` -- -DROP TABLE IF EXISTS `phpwebgallery_ws_access`; -CREATE TABLE `phpwebgallery_ws_access` ( +DROP TABLE IF EXISTS `piwigo_ws_access`; +CREATE TABLE `piwigo_ws_access` ( `id` smallint(5) unsigned NOT NULL auto_increment, `name` varchar(32) NOT NULL default '', `access` varchar(255) default NULL, diff --git a/install/upgrade_1.4.0.php b/install/upgrade_1.4.0.php index c7ad6ac69..f49e2f9f2 100644 --- a/install/upgrade_1.4.0.php +++ b/install/upgrade_1.4.0.php @@ -69,72 +69,72 @@ mysql_query($query); $queries = array( " -ALTER TABLE phpwebgallery_categories +ALTER TABLE piwigo_categories CHANGE COLUMN date_last date_last datetime default NULL ;", " -ALTER TABLE phpwebgallery_comments +ALTER TABLE piwigo_comments ADD COLUMN validation_date datetime default NULL ;", " -UPDATE phpwebgallery_comments +UPDATE piwigo_comments SET validation_date = date ", " -ALTER TABLE phpwebgallery_comments +ALTER TABLE piwigo_comments ADD INDEX comments_i1 (image_id) ;", " -ALTER TABLE phpwebgallery_comments +ALTER TABLE piwigo_comments ADD INDEX comments_i2 (validation_date) ;", " -ALTER TABLE phpwebgallery_favorites +ALTER TABLE piwigo_favorites CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0' ;", " -ALTER TABLE phpwebgallery_images +ALTER TABLE piwigo_images CHANGE COLUMN date_available date_available datetime NOT NULL default '0000-00-00 00:00:00' ;", " -ALTER TABLE phpwebgallery_rate +ALTER TABLE piwigo_rate CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0' ;", " -ALTER TABLE phpwebgallery_sessions +ALTER TABLE piwigo_sessions CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0' ;", " -ALTER TABLE phpwebgallery_user_access +ALTER TABLE piwigo_user_access CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0' ;", " -DROP TABLE phpwebgallery_user_forbidden +DROP TABLE piwigo_user_forbidden ;", " -ALTER TABLE phpwebgallery_user_group +ALTER TABLE piwigo_user_group CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0' ;", " -ALTER TABLE phpwebgallery_users +ALTER TABLE piwigo_users CHANGE COLUMN id id smallint(5) NOT NULL auto_increment ;", " -CREATE TABLE phpwebgallery_caddie ( +CREATE TABLE piwigo_caddie ( user_id smallint(5) NOT NULL default '0', element_id mediumint(8) NOT NULL default '0', PRIMARY KEY (user_id,element_id) @@ -142,7 +142,7 @@ CREATE TABLE phpwebgallery_caddie ( ;", " -CREATE TABLE phpwebgallery_user_cache ( +CREATE TABLE piwigo_user_cache ( user_id smallint(5) NOT NULL default '0', need_update enum('true','false') NOT NULL default 'true', forbidden_categories text, @@ -151,7 +151,7 @@ CREATE TABLE phpwebgallery_user_cache ( ;", " -CREATE TABLE phpwebgallery_user_feed ( +CREATE TABLE piwigo_user_feed ( id varchar(50) binary NOT NULL default '', user_id smallint(5) NOT NULL default '0', last_check datetime default NULL, @@ -160,7 +160,7 @@ CREATE TABLE phpwebgallery_user_feed ( ;", " -CREATE TABLE phpwebgallery_user_infos ( +CREATE TABLE piwigo_user_infos ( user_id smallint(5) NOT NULL default '0', nb_image_line tinyint(1) unsigned NOT NULL default '5', nb_line_page tinyint(3) unsigned NOT NULL default '3', @@ -180,11 +180,11 @@ CREATE TABLE phpwebgallery_user_infos ( foreach ($queries as $query) { - $query = str_replace('phpwebgallery_', PREFIX_TABLE, $query); + $query = str_replace('piwigo_', PREFIX_TABLE, $query); pwg_query($query); } -// user datas migration from phpwebgallery_users to phpwebgallery_user_infos +// user datas migration from piwigo_users to piwigo_user_infos $query = ' SELECT * FROM '.USERS_TABLE.' @@ -253,7 +253,7 @@ INSERT INTO ".CONFIG_TABLE." VALUES ( 'gallery_title', - 'PhpWebGallery demonstration site', + 'Piwigo demonstration site', 'Title at top of each page and for RSS feed' ) ;", @@ -273,7 +273,7 @@ INSERT INTO ".CONFIG_TABLE." foreach ($queries as $query) { - $query = str_replace('phpwebgallery_', PREFIX_TABLE, $query); + $query = str_replace('piwigo_', PREFIX_TABLE, $query); pwg_query($query); } diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php index 450de7279..8b1ee34ee 100644 --- a/tools/create_listing_file.php +++ b/tools/create_listing_file.php @@ -31,13 +31,13 @@ $conf['version'] = 'branch 1.7'; // URL of main gallery // Example : http://www.my.domain/my/directory -$conf['gallery'] = 'http://demo.phpwebgallery.net/'; +$conf['gallery'] = 'http://demo.piwigo.net/'; // prefix for thumbnails in "thumbnail" sub directories $conf['prefix_thumbnail'] = 'TN-'; // $conf['file_ext'] lists all extensions (case insensitive) allowed -// for your PhpWebGallery installation +// for your Piwigo installation $conf['file_ext'] = array('jpg','JPG','jpeg','JPEG', 'png','PNG','gif','GIF','mpg','zip', 'avi','mp3','ogg'); @@ -74,9 +74,9 @@ $conf['use_exif_mapping'] = array( // to false $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', @@ -1121,7 +1121,7 @@ function pwg_test_exit() } else { - exit('<pre>PWG-ERROR-4: PhpWebGallery versions differs</pre>'); + exit('<pre>PWG-ERROR-4: Piwigo versions differs</pre>'); } } @@ -1661,7 +1661,7 @@ if ($_SESSION['scan_step'] == 'exit') <style type="text/css"> code {font-weight: bold} img {border-style: none; vertical-align: middle} - ul {list-style-image: url(<?php echo $pwg_conf['icon_dir']; ?>add_tag.png)} + ul {list-style-image: url(<?php echo $pwg_conf['icon_dir']; ?>add_tag.png)} .success {color: green} .warning {color: orange} .failure {color: red} @@ -1677,9 +1677,9 @@ if ($_SESSION['scan_step'] == 'exit') <body> <div class="content"> <fieldset class="header"> - <span class="p">Php</span> - <span class="w">Web</span> - <span class="g">Gallery</span> + <span class="p">Pi</span> + <span class="w">wi</span> + <span class="g">go</span> remote site<? echo $g_header; ?> </fieldset> <fieldset> @@ -1687,7 +1687,7 @@ if ($_SESSION['scan_step'] == 'exit') </fieldset> <fieldset class="footer"> <div class="pwg_block"> - Powered by <a href="http://www.phpwebgallery.net" class="pwg"><span class="p">Php</span><span class="w">Web</span><span class="g">Gallery</span></a> + Powered by <a href="http://piwigo.org" class="pwg"><span class="p">Pi</span><span class="w">wi</span><span class="g">go</span></a> </div> <?php echo $g_footer; ?> </fieldset> |