Changeset 2339


Ignore:
Timestamp:
May 15, 2008, 12:25:36 AM (16 years ago)
Author:
rub
Message:

Change some PhpWebGallery to Piwigo.
Not all PhpWebGallery has been translated!

Location:
trunk
Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/admin.php

    r2328 r2339  
    136136}
    137137
    138 // Add the PhpWebGallery Official menu
     138// Add the Piwigo Official menu
    139139  $template->assign( 'pwgmenu', pwg_URL() );
    140140 

  • trunk/admin/cat_options.php

    r2324 r2339  
    129129    {
    130130      // theoretically, all categories in $_POST['cat_false'] contain at
    131       // least one element, so PhpWebGallery can find a representant.
     131      // least one element, so Piwigo can find a representant.
    132132      set_random_representant($_POST['cat_false']);
    133133      break;

  • trunk/admin/include/functions.php

    r2333 r2339  
    221221    // destruction of the caddie associated with the user
    222222    CADDIE_TABLE,
    223     // deletion of phpwebgallery specific informations
     223    // deletion of piwigo specific informations
    224224    USER_INFOS_TABLE,
    225225    );
    … …  
    16951695
    16961696/**
    1697  * Create an XML file with PhpWebGallery informations about a list of
     1697 * Create an XML file with Piwigo informations about a list of
    16981698 * pictures.
    16991699 *
    17001700 * The goal of the export feature is to make easier the reading of
    1701  * informations related to pictures outside of PhpWebGallery.
     1701 * informations related to pictures outside of Piwigo.
    17021702 *
    17031703 * @param array image_ids
    … …  
    17861786
    17871787/**
    1788  * Refer main PhpWebGallery URLs (currently PHPWG_DOMAIN domain)
     1788 * Refer main Piwigo URLs (currently PHPWG_DOMAIN domain)
    17891789 *
    17901790 * @param void

  • trunk/admin/include/functions_upgrade.php

    r2299 r2339  
    2424function check_upgrade()
    2525{
    26   // Is PhpWebGallery already installed ?
     26  // Is Piwigo already installed ?
    2727  if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
    2828  {
    29     $message = 'PhpWebGallery is not in upgrade mode. In include/mysql.inc.php,
     29    $message = 'Piwigo is not in upgrade mode. In include/mysql.inc.php,
    3030insert line
    3131<pre style="background-color:lightgray">

  • trunk/admin/ws_checker.php

    r2299 r2339  
    294294    preg_match('/\d\d\d/', $response, $status_code);
    295295    switch( $status_code[0] ) {
    296         case 200:
     296      case 200:
    297297        $ws_status = l10n('Web Services under control');
    298                 break;
    299         case 503:
    300                 $ws_status = 'PhpWebGallery Web Services failed and returned an '
     298        break;
     299      case 503:
     300        $ws_status = 'Piwigo Web Services failed and returned an '
    301301                   . 'HTTP status of 503. Service is unavailable. An internal '
    302302                   . 'problem prevented us from returning data to you.';
    303                 break;
    304         case 403:
    305                 $ws_status = 'PhpWebGallery Web Services failed and returned an '
     303        break;
     304      case 403:
     305        $ws_status = 'Piwigo Web Services failed and returned an '
    306306                   . 'HTTP status of 403. Access is forbidden. You do not have '
    307307                   . 'permission to access this resource, or are over '
    308308                   . 'your rate limit.';
    309                 break;
    310         case 400:
    311                 // You may want to fall through here and read the specific XML error
    312                 $ws_status = 'PhpWebGallery Web Services failed and returned an '
     309        break;
     310      case 400:
     311        // You may want to fall through here and read the specific XML error
     312        $ws_status = 'Piwigo Web Services failed and returned an '
    313313                   . 'HTTP status of 400. Bad request. The parameters passed '
    314314                   . 'to the service did not match as expected. The exact '
    315315                   . 'error is returned in the XML response.';
    316                 break;
    317         default:
    318                 $ws_status = 'PhpWebGallery Web Services returned an unexpected HTTP '
     316        break;
     317      default:
     318        $ws_status = 'Piwigo Web Services returned an unexpected HTTP '
    319319                   . 'status of:' . $status_code[0];
    320320    }

  • trunk/feed.php

    r2299 r2339  
    137137
    138138    $item->date = mysqldt_to_ts($dbnow);
    139     $item->author = 'PhpWebGallery notifier';
     139    $item->author = 'Piwigo notifier';
    140140    $item->guid= sprintf('%s', $dbnow);;
    141141
    … …  
    189189
    190190  $item->date = mysqldt_to_ts($date);
    191   $item->author = 'PhpWebGallery notifier';
     191  $item->author = 'Piwigo notifier';
    192192  $item->guid= sprintf('%s', 'pics-'.$date);;
    193193

  • trunk/include/config_default.inc.php

    r2334 r2339  
    141141$conf['tn_height'] = 128;
    142142
    143 // show_version : shall the version of PhpWebGallery be displayed at the
     143// show_version : shall the version of Piwigo be displayed at the
    144144// bottom of each page ?
    145145$conf['show_version'] = true;
    … …  
    152152//  for each link is associated a label
    153153//  $conf['links'] = array(
    154 //    'http://phpwebgallery.net' => 'PWG website',
     154//    'http://piwigo.org' => 'PWG website',
    155155//    'http://forum.phpwebgallery.net' => 'PWG forum',
    156156//    'http://phpwebgallery.net/doc' => 'PWG wiki'
    … …  
    161161//  you can pass a array with different optional parameter values
    162162//  $conf['links'] = array(
    163 //    'http://phpwebgallery.net' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'),
     163//    'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'),
    164164//    'http://forum.phpwebgallery.net' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
    165165//    'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'),
    … …  
    186186// Equivalence:
    187187//  $conf['links'] = array(
    188 //    'http://phpwebgallery.net' => 'PWG website',
     188//    'http://piwigo.org' => 'PWG website',
    189189//    );
    190190//  $conf['links'] = array(
    191 //    'http://phpwebgallery.net' => array('label' => 'PWG website', 'new_window' => false, 'visible' => 'return true;'),
     191//    'http://piwigo.org' => array('label' => 'PWG website', 'new_window' => false, 'visible' => 'return true;'),
    192192//    );
    193193//
    … …  
    224224$conf['display_fromto'] = false;
    225225
    226 // allow_random_representative : do you wish PhpWebGallery to search among
     226// allow_random_representative : do you wish Piwigo to search among
    227227// categories elements a new representative at each reload ?
    228228//
    … …  
    322322$conf['use_iptc'] = false;
    323323
    324 // use_iptc_mapping : in which IPTC fields will PhpWebGallery find image
     324// use_iptc_mapping : in which IPTC fields will Piwigo find image
    325325// information ? This setting is used during metadata synchronisation. It
    326 // associates a phpwebgallery_images column name to a IPTC key
     326// associates a piwigo_images column name to a IPTC key
    327327$conf['use_iptc_mapping'] = array(
    328328  'keywords'        => '2#025',
    … …  
    430430
    431431// users_table: which table is the reference for users? Can be a different
    432 // table than PhpWebGallery table
     432// table than Piwigo table
    433433//
    434434// If you decide to use another table than the default one, you need to
    435435// prepare your database by deleting some datas :
    436436//
    437 // delete from phpwebgallery_user_access;
    438 // delete from phpwebgallery_user_cache;
    439 // delete from phpwebgallery_user_feed;
    440 // delete from phpwebgallery_user_group;
    441 // delete from phpwebgallery_user_infos;
    442 // delete from phpwebgallery_sessions;
    443 // delete from phpwebgallery_rate;
    444 // update phpwebgallery_images set average_rate = NULL;
    445 // delete from phpwebgallery_caddie;
    446 // delete from phpwebgallery_favorites;
     437// delete from piwigo_user_access;
     438// delete from piwigo_user_cache;
     439// delete from piwigo_user_feed;
     440// delete from piwigo_user_group;
     441// delete from piwigo_user_infos;
     442// delete from piwigo_sessions;
     443// delete from piwigo_rate;
     444// update piwigo_images set average_rate = null;
     445// delete from piwigo_caddie;
     446// delete from piwigo_favorites;
    447447//
    448448// All informations contained in these tables and column are related to
    449 // phpwebgallery_users table.
     449// piwigo_users table.
    450450$conf['users_table'] = $prefixeTable.'users';
    451451

  • trunk/include/functions.inc.php

    r2333 r2339  
    467467}
    468468
    469 //-------------------------------------------- PhpWebGallery specific functions
     469//-------------------------------------------- Piwigo specific functions
    470470
    471471/**
    … …  
    914914
    915915/* returns the relative path of the thumnail with regards to to the root
    916 of phpwebgallery (not the current page!).This function is not intended to be
     916of piwigo (not the current page!).This function is not intended to be
    917917called directly from code.*/
    918918function get_thumbnail_location($element_info)
    … …  
    13921392 * in descending order of preference:
    13931393 *   param language, user language, default language
    1394  * PhpWebGallery default language.
     1394 * Piwigo default language.
    13951395 *
    13961396 * @param string filename

  • trunk/include/functions_category.inc.php

    r2325 r2339  
    189189// get_local_dir
    190190// Example : "pets > rex > 1_year_old" is on the the same site as the
    191 // PhpWebGallery files and this category has 22 for identifier
     191// Piwigo files and this category has 22 for identifier
    192192// get_complete_dir(22) returns "./galleries/pets/rex/1_year_old/"
    193193function get_complete_dir( $category_id )
    … …  
    198198// get_local_dir returns an array with complete path without the site url
    199199// Example : "pets > rex > 1_year_old" is on the the same site as the
    200 // PhpWebGallery files and this category has 22 for identifier
     200// Piwigo files and this category has 22 for identifier
    201201// get_local_dir(22) returns "pets/rex/1_year_old/"
    202202function get_local_dir( $category_id )

  • trunk/include/functions_cookie.inc.php

    r2299 r2339  
    2222// +-----------------------------------------------------------------------+
    2323
    24 // cookie_path returns the path to use for the PhpWebGallery cookie.
    25 // If PhpWebGallery is installed on :
     24// cookie_path returns the path to use for the Piwigo cookie.
     25// If Piwigo is installed on :
    2626// http://domain.org/meeting/gallery/category.php
    2727// cookie_path will return : "/meeting/gallery"

  • trunk/include/functions_mail.inc.php

    r2299 r2339  
    6868 * - email_webmaster: mail corresponding to $conf['webmaster_id']
    6969 * - formated_email_webmaster: the name of webmaster is $conf['gallery_title']
    70  * - text_footer: PhpWebGallery and version
     70 * - text_footer: Piwigo and version
    7171 *
    7272 * @return array
    … …  
    523523
    524524/*
    525  * sends an email, using PhpWebGallery specific informations
     525 * sends an email, using Piwigo specific informations
    526526 *
    527527 * @param:
    … …  
    531531 *       o Cc: array of carbon copy receivers of the mail. [default value empty]
    532532 *       o Bcc: array of blind carbon copy receivers of the mail. [default value empty]
    533  *       o subject  [default value 'PhpWebGallery']
     533 *       o subject  [default value 'Piwigo']
    534534 *       o content: content of mail    [default value '']
    535535 *       o content_format: format of mail content  [default value 'text/plain']
    … …  
    576576  if (empty($args['subject']))
    577577  {
    578     $args['subject'] = 'PhpWebGallery';
     578    $args['subject'] = 'Piwigo';
    579579  }
    580580  // Spring cleaning
    … …  
    752752 *   - result of other sendmail
    753753 *   - to: Receiver or receiver(s) of the mail.
    754  *   - subject  [default value 'PhpWebGallery']
     754 *   - subject  [default value 'Piwigo']
    755755 *   - content: content of mail
    756756 *   - headers: headers of mail

  • trunk/include/functions_plugins.inc.php

    r2299 r2339  
    2323
    2424/*
    25 Events and event handlers are the core of PhpWebGallery plugin management.
     25Events and event handlers are the core of Piwigo plugin management.
    2626Plugins are addons that are found in plugins subdirectory. If activated, PWG
    2727will include the index.php of each plugin.

  • trunk/install.php

    r2299 r2339  
    143143//----------------------------------------------------- variable initialization
    144144
    145 define('DEFAULT_PREFIX_TABLE', 'phpwebgallery_');
     145define('DEFAULT_PREFIX_TABLE', 'piwigo_');
    146146
    147147// Obtain various vars
    … …  
    173173{
    174174  include($config_file);
    175   // Is PhpWebGallery already installed ?
     175  // Is Piwigo already installed ?
    176176  if (defined("PHPWG_INSTALLED"))
    177177  {
    178     die('PhpWebGallery is already installed');
     178    die('Piwigo is already installed');
    179179  }
    180180}
    … …  
    300300    create_empty_local_files();
    301301
    302     // tables creation, based on phpwebgallery_structure.sql
     302    // tables creation, based on piwigo_structure.sql
    303303    execute_sqlfile(
    304       PHPWG_ROOT_PATH.'install/phpwebgallery_structure.sql',
     304      PHPWG_ROOT_PATH.'install/piwigo_structure.sql',
    305305      DEFAULT_PREFIX_TABLE,
    306306      $table_prefix

  • trunk/install/piwigo_structure.sql

    r2336 r2339  
    66
    77--
    8 -- Table structure for table `phpwebgallery_caddie`
    9 --
    10 
    11 DROP TABLE IF EXISTS `phpwebgallery_caddie`;
    12 CREATE TABLE `phpwebgallery_caddie` (
     8-- Table structure for table `piwigo_caddie`
     9--
     10
     11DROP TABLE IF EXISTS `piwigo_caddie`;
     12CREATE TABLE `piwigo_caddie` (
    1313  `user_id` smallint(5) NOT NULL default '0',
    1414  `element_id` mediumint(8) NOT NULL default '0',
    … …  
    1717
    1818--
    19 -- Table structure for table `phpwebgallery_categories`
    20 --
    21 
    22 DROP TABLE IF EXISTS `phpwebgallery_categories`;
    23 CREATE TABLE `phpwebgallery_categories` (
     19-- Table structure for table `piwigo_categories`
     20--
     21
     22DROP TABLE IF EXISTS `piwigo_categories`;
     23CREATE TABLE `piwigo_categories` (
    2424  `id` smallint(5) unsigned NOT NULL auto_increment,
    2525  `name` varchar(255) NOT NULL default '',
    … …  
    4444
    4545--
    46 -- Table structure for table `phpwebgallery_comments`
    47 --
    48 
    49 DROP TABLE IF EXISTS `phpwebgallery_comments`;
    50 CREATE TABLE `phpwebgallery_comments` (
     46-- Table structure for table `piwigo_comments`
     47--
     48
     49DROP TABLE IF EXISTS `piwigo_comments`;
     50CREATE TABLE `piwigo_comments` (
    5151  `id` int(11) unsigned NOT NULL auto_increment,
    5252  `image_id` mediumint(8) unsigned NOT NULL default '0',
    … …  
    6262
    6363--
    64 -- Table structure for table `phpwebgallery_config`
    65 --
    66 
    67 DROP TABLE IF EXISTS `phpwebgallery_config`;
    68 CREATE TABLE `phpwebgallery_config` (
     64-- Table structure for table `piwigo_config`
     65--
     66
     67DROP TABLE IF EXISTS `piwigo_config`;
     68CREATE TABLE `piwigo_config` (
    6969  `param` varchar(40) NOT NULL default '',
    7070  `value` text,
    … …  
    7474
    7575--
    76 -- Table structure for table `phpwebgallery_favorites`
    77 --
    78 
    79 DROP TABLE IF EXISTS `phpwebgallery_favorites`;
    80 CREATE TABLE `phpwebgallery_favorites` (
     76-- Table structure for table `piwigo_favorites`
     77--
     78
     79DROP TABLE IF EXISTS `piwigo_favorites`;
     80CREATE TABLE `piwigo_favorites` (
    8181  `user_id` smallint(5) NOT NULL default '0',
    8282  `image_id` mediumint(8) unsigned NOT NULL default '0',
    … …  
    8585
    8686--
    87 -- Table structure for table `phpwebgallery_group_access`
    88 --
    89 
    90 DROP TABLE IF EXISTS `phpwebgallery_group_access`;
    91 CREATE TABLE `phpwebgallery_group_access` (
     87-- Table structure for table `piwigo_group_access`
     88--
     89
     90DROP TABLE IF EXISTS `piwigo_group_access`;
     91CREATE TABLE `piwigo_group_access` (
    9292  `group_id` smallint(5) unsigned NOT NULL default '0',
    9393  `cat_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    9696
    9797--
    98 -- Table structure for table `phpwebgallery_groups`
    99 --
    100 
    101 DROP TABLE IF EXISTS `phpwebgallery_groups`;
    102 CREATE TABLE `phpwebgallery_groups` (
     98-- Table structure for table `piwigo_groups`
     99--
     100
     101DROP TABLE IF EXISTS `piwigo_groups`;
     102CREATE TABLE `piwigo_groups` (
    103103  `id` smallint(5) unsigned NOT NULL auto_increment,
    104104  `name` varchar(255) NOT NULL default '',
    … …  
    109109
    110110--
    111 -- Table structure for table `phpwebgallery_history`
    112 --
    113 
    114 DROP TABLE IF EXISTS `phpwebgallery_history`;
    115 CREATE TABLE `phpwebgallery_history` (
     111-- Table structure for table `piwigo_history`
     112--
     113
     114DROP TABLE IF EXISTS `piwigo_history`;
     115CREATE TABLE `piwigo_history` (
    116116  `id` int(10) unsigned NOT NULL auto_increment,
    117117  `date` date NOT NULL default '0000-00-00',
    … …  
    130130
    131131--
    132 -- Table structure for table `phpwebgallery_history_summary`
    133 --
    134 
    135 DROP TABLE IF EXISTS `phpwebgallery_history_summary`;
    136 CREATE TABLE `phpwebgallery_history_summary` (
     132-- Table structure for table `piwigo_history_summary`
     133--
     134
     135DROP TABLE IF EXISTS `piwigo_history_summary`;
     136CREATE TABLE `piwigo_history_summary` (
    137137  `year` smallint(4) NOT NULL default '0',
    138138  `month` tinyint(2) default NULL,
    … …  
    144144
    145145--
    146 -- Table structure for table `phpwebgallery_image_category`
    147 --
    148 
    149 DROP TABLE IF EXISTS `phpwebgallery_image_category`;
    150 CREATE TABLE `phpwebgallery_image_category` (
     146-- Table structure for table `piwigo_image_category`
     147--
     148
     149DROP TABLE IF EXISTS `piwigo_image_category`;
     150CREATE TABLE `piwigo_image_category` (
    151151  `image_id` mediumint(8) unsigned NOT NULL default '0',
    152152  `category_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    156156
    157157--
    158 -- Table structure for table `phpwebgallery_image_tag`
    159 --
    160 
    161 DROP TABLE IF EXISTS `phpwebgallery_image_tag`;
    162 CREATE TABLE `phpwebgallery_image_tag` (
     158-- Table structure for table `piwigo_image_tag`
     159--
     160
     161DROP TABLE IF EXISTS `piwigo_image_tag`;
     162CREATE TABLE `piwigo_image_tag` (
    163163  `image_id` mediumint(8) unsigned NOT NULL default '0',
    164164  `tag_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    168168
    169169--
    170 -- Table structure for table `phpwebgallery_images`
    171 --
    172 
    173 DROP TABLE IF EXISTS `phpwebgallery_images`;
    174 CREATE TABLE `phpwebgallery_images` (
     170-- Table structure for table `piwigo_images`
     171--
     172
     173DROP TABLE IF EXISTS `piwigo_images`;
     174CREATE TABLE `piwigo_images` (
    175175  `id` mediumint(8) unsigned NOT NULL auto_increment,
    176176  `file` varchar(255) NOT NULL default '',
    … …  
    202202
    203203--
    204 -- Table structure for table `phpwebgallery_old_permalinks`
    205 --
    206 
    207 DROP TABLE IF EXISTS `phpwebgallery_old_permalinks`;
    208 CREATE TABLE `phpwebgallery_old_permalinks` (
     204-- Table structure for table `piwigo_old_permalinks`
     205--
     206
     207DROP TABLE IF EXISTS `piwigo_old_permalinks`;
     208CREATE TABLE `piwigo_old_permalinks` (
    209209  `cat_id` smallint(5) unsigned NOT NULL default '0',
    210210  `permalink` varchar(64) NOT NULL default '',
    … …  
    216216
    217217--
    218 -- Table structure for table `phpwebgallery_plugins`
    219 --
    220 
    221 DROP TABLE IF EXISTS `phpwebgallery_plugins`;
    222 CREATE TABLE `phpwebgallery_plugins` (
     218-- Table structure for table `piwigo_plugins`
     219--
     220
     221DROP TABLE IF EXISTS `piwigo_plugins`;
     222CREATE TABLE `piwigo_plugins` (
    223223  `id` varchar(64) binary NOT NULL default '',
    224224  `state` enum('inactive','active') NOT NULL default 'inactive',
    … …  
    228228
    229229--
    230 -- Table structure for table `phpwebgallery_rate`
    231 --
    232 
    233 DROP TABLE IF EXISTS `phpwebgallery_rate`;
    234 CREATE TABLE `phpwebgallery_rate` (
     230-- Table structure for table `piwigo_rate`
     231--
     232
     233DROP TABLE IF EXISTS `piwigo_rate`;
     234CREATE TABLE `piwigo_rate` (
    235235  `user_id` smallint(5) NOT NULL default '0',
    236236  `element_id` mediumint(8) unsigned NOT NULL default '0',
    … …  
    242242
    243243--
    244 -- Table structure for table `phpwebgallery_search`
    245 --
    246 
    247 DROP TABLE IF EXISTS `phpwebgallery_search`;
    248 CREATE TABLE `phpwebgallery_search` (
     244-- Table structure for table `piwigo_search`
     245--
     246
     247DROP TABLE IF EXISTS `piwigo_search`;
     248CREATE TABLE `piwigo_search` (
    249249  `id` int(10) unsigned NOT NULL auto_increment,
    250250  `last_seen` date default NULL,
    … …  
    254254
    255255--
    256 -- Table structure for table `phpwebgallery_sessions`
    257 --
    258 
    259 DROP TABLE IF EXISTS `phpwebgallery_sessions`;
    260 CREATE TABLE `phpwebgallery_sessions` (
     256-- Table structure for table `piwigo_sessions`
     257--
     258
     259DROP TABLE IF EXISTS `piwigo_sessions`;
     260CREATE TABLE `piwigo_sessions` (
    261261  `id` varchar(255) binary NOT NULL default '',
    262262  `data` mediumtext NOT NULL,
    … …  
    266266
    267267--
    268 -- Table structure for table `phpwebgallery_sites`
    269 --
    270 
    271 DROP TABLE IF EXISTS `phpwebgallery_sites`;
    272 CREATE TABLE `phpwebgallery_sites` (
     268-- Table structure for table `piwigo_sites`
     269--
     270
     271DROP TABLE IF EXISTS `piwigo_sites`;
     272CREATE TABLE `piwigo_sites` (
    273273  `id` tinyint(4) NOT NULL auto_increment,
    274274  `galleries_url` varchar(255) NOT NULL default '',
    … …  
    278278
    279279--
    280 -- Table structure for table `phpwebgallery_tags`
    281 --
    282 
    283 DROP TABLE IF EXISTS `phpwebgallery_tags`;
    284 CREATE TABLE `phpwebgallery_tags` (
     280-- Table structure for table `piwigo_tags`
     281--
     282
     283DROP TABLE IF EXISTS `piwigo_tags`;
     284CREATE TABLE `piwigo_tags` (
    285285  `id` smallint(5) unsigned NOT NULL auto_increment,
    286286  `name` varchar(255) binary NOT NULL default '',
    … …  
    291291
    292292--
    293 -- Table structure for table `phpwebgallery_upgrade`
    294 --
    295 
    296 DROP TABLE IF EXISTS `phpwebgallery_upgrade`;
    297 CREATE TABLE `phpwebgallery_upgrade` (
     293-- Table structure for table `piwigo_upgrade`
     294--
     295
     296DROP TABLE IF EXISTS `piwigo_upgrade`;
     297CREATE TABLE `piwigo_upgrade` (
    298298  `id` varchar(20) NOT NULL default '',
    299299  `applied` datetime NOT NULL default '0000-00-00 00:00:00',
    … …  
    303303
    304304--
    305 -- Table structure for table `phpwebgallery_user_access`
    306 --
    307 
    308 DROP TABLE IF EXISTS `phpwebgallery_user_access`;
    309 CREATE TABLE `phpwebgallery_user_access` (
     305-- Table structure for table `piwigo_user_access`
     306--
     307
     308DROP TABLE IF EXISTS `piwigo_user_access`;
     309CREATE TABLE `piwigo_user_access` (
    310310  `user_id` smallint(5) NOT NULL default '0',
    311311  `cat_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    314314
    315315--
    316 -- Table structure for table `phpwebgallery_user_cache`
    317 --
    318 
    319 DROP TABLE IF EXISTS `phpwebgallery_user_cache`;
    320 CREATE TABLE `phpwebgallery_user_cache` (
     316-- Table structure for table `piwigo_user_cache`
     317--
     318
     319DROP TABLE IF EXISTS `piwigo_user_cache`;
     320CREATE TABLE `piwigo_user_cache` (
    321321  `user_id` smallint(5) NOT NULL default '0',
    322322  `need_update` enum('true','false') NOT NULL default 'true',
    … …  
    329329
    330330--
    331 -- Table structure for table `phpwebgallery_user_cache_categories`
    332 --
    333 
    334 DROP TABLE IF EXISTS `phpwebgallery_user_cache_categories`;
    335 CREATE TABLE `phpwebgallery_user_cache_categories` (
     331-- Table structure for table `piwigo_user_cache_categories`
     332--
     333
     334DROP TABLE IF EXISTS `piwigo_user_cache_categories`;
     335CREATE TABLE `piwigo_user_cache_categories` (
    336336  `user_id` smallint(5) NOT NULL default '0',
    337337  `cat_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    345345
    346346--
    347 -- Table structure for table `phpwebgallery_user_feed`
    348 --
    349 
    350 DROP TABLE IF EXISTS `phpwebgallery_user_feed`;
    351 CREATE TABLE `phpwebgallery_user_feed` (
     347-- Table structure for table `piwigo_user_feed`
     348--
     349
     350DROP TABLE IF EXISTS `piwigo_user_feed`;
     351CREATE TABLE `piwigo_user_feed` (
    352352  `id` varchar(50) binary NOT NULL default '',
    353353  `user_id` smallint(5) NOT NULL default '0',
    … …  
    357357
    358358--
    359 -- Table structure for table `phpwebgallery_user_group`
    360 --
    361 
    362 DROP TABLE IF EXISTS `phpwebgallery_user_group`;
    363 CREATE TABLE `phpwebgallery_user_group` (
     359-- Table structure for table `piwigo_user_group`
     360--
     361
     362DROP TABLE IF EXISTS `piwigo_user_group`;
     363CREATE TABLE `piwigo_user_group` (
    364364  `user_id` smallint(5) NOT NULL default '0',
    365365  `group_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    368368
    369369--
    370 -- Table structure for table `phpwebgallery_user_infos`
    371 --
    372 
    373 DROP TABLE IF EXISTS `phpwebgallery_user_infos`;
    374 CREATE TABLE `phpwebgallery_user_infos` (
     370-- Table structure for table `piwigo_user_infos`
     371--
     372
     373DROP TABLE IF EXISTS `piwigo_user_infos`;
     374CREATE TABLE `piwigo_user_infos` (
    375375  `user_id` smallint(5) NOT NULL default '0',
    376376  `nb_image_line` tinyint(1) unsigned NOT NULL default '5',
    … …  
    393393
    394394--
    395 -- Table structure for table `phpwebgallery_user_mail_notification`
    396 --
    397 
    398 DROP TABLE IF EXISTS `phpwebgallery_user_mail_notification`;
    399 CREATE TABLE `phpwebgallery_user_mail_notification` (
     395-- Table structure for table `piwigo_user_mail_notification`
     396--
     397
     398DROP TABLE IF EXISTS `piwigo_user_mail_notification`;
     399CREATE TABLE `piwigo_user_mail_notification` (
    400400  `user_id` smallint(5) NOT NULL default '0',
    401401  `check_key` varchar(16) binary NOT NULL default '',
    … …  
    407407
    408408--
    409 -- Table structure for table `phpwebgallery_users`
    410 --
    411 
    412 DROP TABLE IF EXISTS `phpwebgallery_users`;
    413 CREATE TABLE `phpwebgallery_users` (
     409-- Table structure for table `piwigo_users`
     410--
     411
     412DROP TABLE IF EXISTS `piwigo_users`;
     413CREATE TABLE `piwigo_users` (
    414414  `id` smallint(5) NOT NULL auto_increment,
    415415  `username` varchar(100) binary NOT NULL default '',
    … …  
    421421
    422422--
    423 -- Table structure for table `phpwebgallery_waiting`
    424 --
    425 
    426 DROP TABLE IF EXISTS `phpwebgallery_waiting`;
    427 CREATE TABLE `phpwebgallery_waiting` (
     423-- Table structure for table `piwigo_waiting`
     424--
     425
     426DROP TABLE IF EXISTS `piwigo_waiting`;
     427CREATE TABLE `piwigo_waiting` (
    428428  `id` int(10) unsigned NOT NULL auto_increment,
    429429  `storage_category_id` smallint(5) unsigned NOT NULL default '0',
    … …  
    439439
    440440--
    441 -- Table structure for table `phpwebgallery_ws_access`
    442 --
    443 
    444 DROP TABLE IF EXISTS `phpwebgallery_ws_access`;
    445 CREATE TABLE `phpwebgallery_ws_access` (
     441-- Table structure for table `piwigo_ws_access`
     442--
     443
     444DROP TABLE IF EXISTS `piwigo_ws_access`;
     445CREATE TABLE `piwigo_ws_access` (
    446446  `id` smallint(5) unsigned NOT NULL auto_increment,
    447447  `name` varchar(32) NOT NULL default '',

  • trunk/install/upgrade_1.4.0.php

    r2299 r2339  
    7070
    7171  "
    72 ALTER TABLE phpwebgallery_categories
     72ALTER TABLE piwigo_categories
    7373  CHANGE COLUMN date_last date_last datetime default NULL
    7474;",
    7575
    7676  "
    77 ALTER TABLE phpwebgallery_comments
     77ALTER TABLE piwigo_comments
    7878  ADD COLUMN validation_date datetime default NULL
    7979;",
    8080
    8181  "
    82 UPDATE phpwebgallery_comments
     82UPDATE piwigo_comments
    8383  SET validation_date = date
    8484",
    8585
    8686  "
    87 ALTER TABLE phpwebgallery_comments
     87ALTER TABLE piwigo_comments
    8888  ADD INDEX comments_i1 (image_id)
    8989;",
    9090
    9191  "
    92 ALTER TABLE phpwebgallery_comments
     92ALTER TABLE piwigo_comments
    9393  ADD INDEX comments_i2 (validation_date)
    9494;",
    9595
    9696  "
    97 ALTER TABLE phpwebgallery_favorites
    98   CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
    99 ;",
    100 
    101   "
    102 ALTER TABLE phpwebgallery_images
     97ALTER TABLE piwigo_favorites
     98  CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
     99;",
     100
     101  "
     102ALTER TABLE piwigo_images
    103103  CHANGE COLUMN date_available
    104104    date_available datetime NOT NULL default '0000-00-00 00:00:00'
    … …  
    106106
    107107  "
    108 ALTER TABLE phpwebgallery_rate
    109   CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
    110 ;",
    111 
    112   "
    113 ALTER TABLE phpwebgallery_sessions
    114   CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
    115 ;",
    116 
    117   "
    118 ALTER TABLE phpwebgallery_user_access
    119   CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
    120 ;",
    121 
    122   "
    123 DROP TABLE phpwebgallery_user_forbidden
    124 ;",
    125 
    126   "
    127 ALTER TABLE phpwebgallery_user_group
     108ALTER TABLE piwigo_rate
     109  CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
     110;",
     111
     112  "
     113ALTER TABLE piwigo_sessions
     114  CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
     115;",
     116
     117  "
     118ALTER TABLE piwigo_user_access
     119  CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
     120;",
     121
     122  "
     123DROP TABLE piwigo_user_forbidden
     124;",
     125
     126  "
     127ALTER TABLE piwigo_user_group
    128128 CHANGE COLUMN user_id user_id smallint(5) NOT NULL default '0'
    129129;",
    130130
    131131  "
    132 ALTER TABLE phpwebgallery_users
     132ALTER TABLE piwigo_users
    133133  CHANGE COLUMN id id smallint(5) NOT NULL auto_increment
    134134;",
    135135
    136136  "
    137 CREATE TABLE phpwebgallery_caddie (
     137CREATE TABLE piwigo_caddie (
    138138  user_id smallint(5) NOT NULL default '0',
    139139  element_id mediumint(8) NOT NULL default '0',
    … …  
    143143
    144144  "
    145 CREATE TABLE phpwebgallery_user_cache (
     145CREATE TABLE piwigo_user_cache (
    146146  user_id smallint(5) NOT NULL default '0',
    147147  need_update enum('true','false') NOT NULL default 'true',
    … …  
    152152
    153153  "
    154 CREATE TABLE phpwebgallery_user_feed (
     154CREATE TABLE piwigo_user_feed (
    155155  id varchar(50) binary NOT NULL default '',
    156156  user_id smallint(5) NOT NULL default '0',
    … …  
    161161
    162162  "
    163 CREATE TABLE phpwebgallery_user_infos (
     163CREATE TABLE piwigo_user_infos (
    164164  user_id smallint(5) NOT NULL default '0',
    165165  nb_image_line tinyint(1) unsigned NOT NULL default '5',
    … …  
    181181foreach ($queries as $query)
    182182{
    183   $query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
     183  $query = str_replace('piwigo_', PREFIX_TABLE, $query);
    184184  pwg_query($query);
    185185}
    186186
    187 // user datas migration from phpwebgallery_users to phpwebgallery_user_infos
     187// user datas migration from piwigo_users to piwigo_user_infos
    188188$query = '
    189189SELECT *
    … …  
    254254  (
    255255    'gallery_title',
    256     'PhpWebGallery demonstration site',
     256    'Piwigo demonstration site',
    257257    'Title at top of each page and for RSS feed'
    258258  )
    … …  
    274274foreach ($queries as $query)
    275275{
    276   $query = str_replace('phpwebgallery_', PREFIX_TABLE, $query);
     276  $query = str_replace('piwigo_', PREFIX_TABLE, $query);
    277277  pwg_query($query);
    278278}

  • trunk/tools/create_listing_file.php

    r2337 r2339  
    3232// URL of main gallery
    3333// Example : http://www.my.domain/my/directory
    34 $conf['gallery'] = 'http://demo.phpwebgallery.net/';
     34$conf['gallery'] = 'http://demo.piwigo.net/';
    3535
    3636// prefix for thumbnails in "thumbnail" sub directories
    … …  
    3838
    3939// $conf['file_ext'] lists all extensions (case insensitive) allowed
    40 // for your PhpWebGallery installation
     40// for your Piwigo installation
    4141$conf['file_ext'] = array('jpg','JPG','jpeg','JPEG',
    4242                          'png','PNG','gif','GIF','mpg','zip',
    … …  
    7575$conf['use_iptc'] = false;
    7676
    77 // use_iptc_mapping : in which IPTC fields will PhpWebGallery find image
     77// use_iptc_mapping : in which IPTC fields will Piwigo find image
    7878// information ? This setting is used during metadata synchronisation. It
    79 // associates a phpwebgallery_images column name to a IPTC key
     79// associates a piwigo_images column name to a IPTC key
    8080$conf['use_iptc_mapping'] = array(
    8181  'keywords'        => '2#025',
    … …  
    11221122    else
    11231123    {
    1124       exit('<pre>PWG-ERROR-4: PhpWebGallery versions differs</pre>');
     1124      exit('<pre>PWG-ERROR-4: Piwigo versions differs</pre>');
    11251125    }
    11261126  }
    … …  
    16621662      code {font-weight: bold}
    16631663      img {border-style: none; vertical-align: middle}
    1664       ul {list-style-image: url(<?php echo $pwg_conf['icon_dir']; ?>add_tag.png)}     
     1664      ul {list-style-image: url(<?php echo $pwg_conf['icon_dir']; ?>add_tag.png)}
    16651665      .success {color: green}
    16661666      .warning {color: orange}
    … …  
    16781678    <div class="content">
    16791679      <fieldset class="header">
    1680         <span class="p">Php</span>
    1681         <span class="w">Web</span>
    1682         <span class="g">Gallery</span>
     1680        <span class="p">Pi</span>
     1681        <span class="w">wi</span>
     1682        <span class="g">go</span>
    16831683        &nbsp;remote site<? echo $g_header; ?>
    16841684      </fieldset>
    … …  
    16881688      <fieldset class="footer">
    16891689        <div class="pwg_block">
    1690           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>
     1690          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>
    16911691        </div>
    16921692        <?php echo $g_footer; ?>
Note: See TracChangeset for help on using the changeset viewer.