feature 2413 added: move gallery_url configuration parameter from database to

local configuration file.


git-svn-id: http://piwigo.org/svn/trunk@11978 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-08-22 17:14:13 +00:00
parent 24ab1e2467
commit 58b18bff0f
37 changed files with 122 additions and 41 deletions
-1
View File
@@ -327,7 +327,6 @@ switch ($page['section'])
array(
'CONF_GALLERY_TITLE' => htmlspecialchars($conf['gallery_title']),
'CONF_PAGE_BANNER' => htmlspecialchars($conf['page_banner']),
'CONF_GALLERY_URL' => $conf['gallery_url'],
'week_starts_on_options' => array(
'sunday' => $lang['day'][0],
'monday' => $lang['day'][1],
@@ -26,13 +26,6 @@
</span>
<textarea rows="5" cols="50" class="description" name="page_banner" id="page_banner">{$main.CONF_PAGE_BANNER}</textarea>
</li>
<li>
<span class="property">
<label for="gallery_url">{'Gallery URL'|@translate}</label>
</span>
<input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{$main.CONF_GALLERY_URL}">
</li>
</ul>
</fieldset>
+5
View File
@@ -554,6 +554,11 @@ $conf['nb_logs_page'] = 300;
// | urls |
// +-----------------------------------------------------------------------+
// gallery_url : you can set a specific URL for the home page of your
// gallery. This is for very specific use and you don't need to change this
// setting when move your gallery to a new directory or a new domain name.
$conf['gallery_url'] = null;
// question_mark_in_urls : the generated urls contain a ? sign. This can be
// changed to false only if the server translates PATH_INFO variable
// (depends on the server AcceptPathInfo directive configuration)
+117
View File
@@ -0,0 +1,117 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
$upgrade_description = 'Move "gallery_url" parameter from config table to local configuration file';
include_once(PHPWG_ROOT_PATH.'include/constants.php');
if (!isset($page))
{
$page = array();
}
if (!isset($page['errors']))
{
$page['errors'] = array();
}
$query = '
SELECT
value
FROM '.CONFIG_TABLE.'
WHERE param =\'gallery_url\'
;';
list($gallery_url) = pwg_db_fetch_row(pwg_query($query));
if (!empty($gallery_url))
{
// let's try to write it in the local configuration file
$local_conf = PHPWG_ROOT_PATH. 'local/config/config.inc.php';
if (isset($conf['local_dir_site']))
{
$local_conf = PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'config/config.inc.php';
}
$conf_line = '$conf[\'gallery_url\'] = \''.$gallery_url.'\';';
if (!is_file($local_conf))
{
$config_file_contents_new = "<?php\n".$conf_line."\n?>";
}
else
{
// we have to update the local conf
$config_file_contents = @file_get_contents($local_conf);
if ($config_file_contents === false)
{
$error = 'Cannot load '.$local_conf.', add by hand: '.$conf_line;
array_push($page['errors'], $error);
echo $error;
}
else
{
$php_end_tag = strrpos($config_file_contents, '?'.'>');
if ($php_end_tag === false)
{
// the file is empty
$config_file_contents_new = "<?php\n".$conf_line."\n?>";
}
else
{
$config_file_contents_new =
substr($config_file_contents, 0, $php_end_tag) . "\n"
.$conf_line."\n"
.substr($config_file_contents, $php_end_tag)
;
}
}
}
if (isset($config_file_contents_new))
{
if (!@file_put_contents($local_conf, $config_file_contents_new))
{
$error = 'Cannot write into local configuration file '.$local_conf.', add by hand: '.$conf_line;
array_push($page['errors'], $error);
echo $error;
}
}
}
$query = '
DELETE
FROM '.CONFIG_TABLE.'
WHERE param =\'gallery_url\'
;';
pwg_query($query);
echo
"\n"
. $upgrade_description
."\n"
;
?>
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'اعلم المدير
$lang['Email admins when a comment requires validation'] = 'اعلم المدير للمصادقة على تعليقات جديدة';
$lang['Environment'] = 'البيئة';
$lang['Form'] = 'نموذج';
$lang['Gallery URL'] = 'عنوان المعرض';
$lang['Gallery title'] = 'عنوان المعرض';
$lang['Grant selected groups'] = 'تصريح المجموعه المختارة';
$lang['Grant selected users'] = 'تصريح المستخدم المختار';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Envia un correu electr
$lang['Email admins when a comment requires validation'] = 'Envia un correu electrònic als administradors quan un comentari requereixi validació';
$lang['Environment'] = 'Entorn';
$lang['Form'] = 'Form';
$lang['Gallery URL'] = 'URL de la galeria';
$lang['Gallery title'] = 'Títol de la galeria';
$lang['Grant selected groups'] = 'Atorgar als grups seleccionats';
$lang['Grant selected users'] = 'Atorgar als usuaris seleccionats';
-1
View File
@@ -87,7 +87,6 @@ $lang['Email admins when a valid comment is entered'] = 'Poslat e-mail administr
$lang['Email admins when a comment requires validation'] = 'Poslat e-mail administrátorovi při vložení nového komentáře vyžadujícího schválení.';
$lang['Environment'] = 'Prostředí';
$lang['Form'] = 'Formulář';
$lang['Gallery URL'] = 'URL galerie';
$lang['Gallery title'] = 'Název galerie';
$lang['Grant selected groups'] = 'Povolit vybrané skupiny';
$lang['Grant selected users'] = 'Povolit vybrané uživatele';
-1
View File
@@ -86,7 +86,6 @@ $lang['Email admins when a valid comment is entered'] = 'Email admins n
$lang['Email admins when a comment requires validation'] = 'Email admins, når en kommentar kræver validering';
$lang['Environment'] = 'Miljø';
$lang['Form'] = 'Form';
$lang['Gallery URL'] = 'Gallery URL';
$lang['Gallery title'] = 'Gallery titel';
$lang['Grant selected groups'] = 'Tildel valgte grupper';
$lang['Grant selected users'] = 'Tildel valgte brugere';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'sende eine Email an den
$lang['Email admins when a comment requires validation'] = 'sende eine Email an den(die) Adminstrator(en) wenn ein Kommentar die Freischaltung durch den Admin erfordert';
$lang['Environment'] = 'Server-Daten';
$lang['Form'] = 'Formular';
$lang['Gallery URL'] = 'genaue URL zur Gallerie';
$lang['Gallery title'] = 'Galerietitel';
$lang['Grant selected groups'] = 'Ausgewählte Gruppen zulassen';
$lang['Grant selected users'] = 'Ausgewählte Benutzer zulassen';
-1
View File
@@ -297,7 +297,6 @@ $lang['Forbidden'] = "Forbidden";
$lang['Form'] = "Form";
$lang['FTP + Synchronization'] = 'FTP + Synchronization';
$lang['Gallery title'] = "Gallery title";
$lang['Gallery URL'] = "Gallery URL";
$lang['GD library is missing'] = "GD library is missing";
$lang['GD version'] = "GD version";
$lang['General statistics'] = "General statistics";
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Notificar a los adminis
$lang['Email admins when a comment requires validation'] = 'Notificar a los administradores cuando un comentario requiere su validación';
$lang['Environment'] = 'Entorno';
$lang['Form'] = 'Formulario';
$lang['Gallery URL'] = 'URL de la galería';
$lang['Gallery title'] = 'Título de la galería';
$lang['Grant selected groups'] = 'Dar el acceso a los grupos seleccionados';
$lang['Grant selected users'] = 'Darles el acceso a los usuarios seleccionados';
-1
View File
@@ -86,7 +86,6 @@ $lang['Email admins when a valid comment is entered'] = "ارسال ايميل
$lang['Email admins when a comment requires validation'] = "ارسال ايميل به مديران زماني که يک نظر نياز به تاييد دارد";
$lang['Environment'] = "محيط(Environment)";
$lang['Form'] = "فرم";
$lang['Gallery URL'] = "URL گالري";
$lang['Gallery title'] = "عنوان گالري";
$lang['Grant selected groups'] = "Grant selected groups";
$lang['Grant selected users'] = "Grant selected users";
-1
View File
@@ -86,7 +86,6 @@ $lang['Email admins when a valid comment is entered'] = "Notifier les administra
$lang['Email admins when a comment requires validation'] = "Notifier les administrateurs quand un commentaire requiert leur validation";
$lang['Environment'] = "Environnement";
$lang['Form'] = "Formulaire";
$lang['Gallery URL'] = "URL de la galerie";
$lang['Gallery title'] = "Titre de la galerie";
$lang['Grant selected groups'] = "Donner l'accès aux groupes sélectionnés";
$lang['Grant selected users'] = "Donner l'accès aux utilisateurs sélectionnés";
-1
View File
@@ -88,7 +88,6 @@ $lang['Email admins when a valid comment is entered'] = "Notifier les administra
$lang['Email admins when a comment requires validation'] = "Notifier les administrateurs quand un commentaire requiert leur validation";
$lang['Environment'] = "Environnement";
$lang['Form'] = "Formulaire";
$lang['Gallery URL'] = "URL de la galerie";
$lang['Gallery title'] = "Titre de la galerie";
$lang['Grant selected groups'] = "Donner l'accès aux groupes sélectionnés";
$lang['Grant selected users'] = "Donner l'accès aux utilisateurs sélectionnés";
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'שלח מייל למנ
$lang['Email admins when a comment requires validation'] = 'שלח מייל למנהל כאשר נדרש אימות לתגובה';
$lang['Environment'] = 'סביבה';
$lang['Form'] = 'טופס';
$lang['Gallery URL'] = 'כתובת הגלריה';
$lang['Gallery title'] = 'כותרת הגלריה';
$lang['Grant selected groups'] = 'להעניק לקבוצות שנבחרו';
$lang['Grant selected users'] = 'להענית למשתמשים שנבחרו';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'E-mail upraviteljima pr
$lang['Email admins when a comment requires validation'] = 'Email upraviteljima kada komentar treba ovjeru';
$lang['Environment'] = 'Okruženje';
$lang['Form'] = 'Oblik';
$lang['Gallery URL'] = 'URL Galerije';
$lang['Gallery title'] = 'Naziv galerije';
$lang['Grant selected groups'] = 'Ovlasti odabrane grupe';
$lang['Grant selected users'] = 'Ovlasti odabrane korisnike';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Email-küldés, ha egy
$lang['Email admins when a comment requires validation'] = 'Email-küldés, ha egy hozzászólás jóváhagyásra vár ';
$lang['Environment'] = 'Környezet';
$lang['Form'] = 'Űrlap';
$lang['Gallery URL'] = 'Galéria URL';
$lang['Gallery title'] = 'Galéria címe';
$lang['Grant selected groups'] = 'Kiválasztott csoportok részére jogosultság adása';
$lang['Grant selected users'] = 'Kiválasztott felhasználók részére jogosultság adása';
-1
View File
@@ -88,7 +88,6 @@ $lang['Email admins when a valid comment is entered'] = 'Notificare gli amminist
$lang['Email admins when a comment requires validation'] = 'Notificare gli amministratori quando un commento richiede un\'approvazione';
$lang['Environment'] = 'Ambiente';
$lang['Form'] = 'Modulo';
$lang['Gallery URL'] = 'URL della galleria';
$lang['Gallery title'] = 'Titolo della galleria';
$lang['Grant selected groups'] = 'Dare l\'accesso ai gruppi selezionati';
$lang['Grant selected users'] = 'Dare l\'accesso agli utenti selezionati';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = '有効なコメント
$lang['Email admins when a comment requires validation'] = 'コメントの承認が必要な場合、管理者にメールする';
$lang['Environment'] = '環境';
$lang['Form'] = 'フォーム';
$lang['Gallery URL'] = 'ギャラリーURI';
$lang['Gallery title'] = 'ギャラリータイトル';
$lang['Grant selected groups'] = '選択したグループに付与する';
$lang['Grant selected users'] = '選択したユーザに付与する';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'შევატყო
$lang['Email admins when a comment requires validation'] = 'შევატყობინოთ ადმინისტრატორს შესამოწმებელი კომანტარის შესახებ';
$lang['Environment'] = 'გარემოცვა';
$lang['Form'] = 'მოქმედებები';
$lang['Gallery URL'] = 'გალერეის მისამართი';
$lang['Gallery title'] = 'გალერეის სახელი';
$lang['Grant selected groups'] = 'ნება დავრთოთ რჩეულ ჯგუფებს';
$lang['Grant selected users'] = 'ნება დავრთოთ რჩეულ მომხმარებლებს';
-1
View File
@@ -82,7 +82,6 @@ $lang['Email admins when a valid comment is entered'] = 'Paziņot adminam, kad d
$lang['Email admins when a comment requires validation'] = 'Paziņot adminam, kad parādījies komentārs, kas jāpārbauda';
$lang['Environment'] = 'Vide';
$lang['Form'] = 'Forma';
$lang['Gallery URL'] = 'Galerijas URL';
$lang['Gallery title'] = 'Galerijas nosaukums';
$lang['Grant selected groups'] = 'Atļaut piekļuvi izvēlētām grupām';
$lang['Grant selected users'] = 'Atļaut piekļuvi izvēlētajiem lietotājiem';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Stuur email naar beheer
$lang['Email admins when a comment requires validation'] = 'Stuur email naar beheerders wanneer een commantaar validatie nodig heeft';
$lang['Environment'] = 'Omgeving';
$lang['Form'] = 'Formulier';
$lang['Gallery URL'] = 'Galerie URL';
$lang['Gallery title'] = 'Galerie-titel';
$lang['Grant selected groups'] = 'Toegang geselecteerde groepen';
$lang['Grant selected users'] = 'Toegang geselecteerde gebruikers';
-1
View File
@@ -82,7 +82,6 @@ $lang['Email admins when a valid comment is entered'] = 'Email administrator nå
$lang['Email admins when a comment requires validation'] = 'Email administrator når en kommentar trenger godkjenning';
$lang['Environment'] = 'Miljø';
$lang['Form'] = 'Skjema';
$lang['Gallery URL'] = 'Galleri URL';
$lang['Gallery title'] = 'Galleri tittel';
$lang['Grant selected groups'] = 'Godkjenn valgte grupper';
$lang['Grant selected users'] = 'Godkjenn valgte brukere';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Wyślij wiadomość do
$lang['Email admins when a comment requires validation'] = 'Wyślij wiadomość do administratora gdy komentarz wymaga weryfikacji';
$lang['Environment'] = 'Środowisko';
$lang['Form'] = 'Formularz';
$lang['Gallery URL'] = 'Adres URL galerii';
$lang['Gallery title'] = 'Tytuł galerii';
$lang['Grant selected groups'] = 'Zezwól zaznaczonym grypom';
$lang['Grant selected users'] = 'Zezwól zaznaczonym użytkownikom';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Notificar os administra
$lang['Email admins when a comment requires validation'] = 'Notificar os administradores quando um comentário necessitar de aprovação';
$lang['Environment'] = 'Arredores';
$lang['Form'] = 'Formulário';
$lang['Gallery URL'] = 'Endereço (URL) da galeria';
$lang['Gallery title'] = 'título da galeria';
$lang['Grant selected groups'] = 'Permitir os grupos selecionados';
$lang['Grant selected users'] = 'Permitir os usuários selecionados';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Notificar os administra
$lang['Email admins when a comment requires validation'] = 'Notificar os administradores quando um comentário necessitar de aprovação';
$lang['Environment'] = 'Ambiente';
$lang['Form'] = 'Formulário';
$lang['Gallery URL'] = 'Endereço (URL) da galeria';
$lang['Gallery title'] = 'Título da galeria';
$lang['Grant selected groups'] = 'Permitir os grupos selecionados';
$lang['Grant selected users'] = 'Permitir os utilizadores selecionados';
-1
View File
@@ -83,7 +83,6 @@ $lang['Email admins when a valid comment is entered'] = 'Anunță administratori
$lang['Email admins when a comment requires validation'] = 'Anunță administratorii atunci cînd un comentariu necesită validare';
$lang['Environment'] = 'Mediul';
$lang['Form'] = 'Formular';
$lang['Gallery URL'] = 'URL-ul galeriei';
$lang['Gallery title'] = 'Titlul galeriei';
$lang['Grant selected groups'] = 'Asigură accesul la grupurile selectate';
$lang['Grant selected users'] = 'Asigură accesul la utilizatorii selectați';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Сообщать адм
$lang['Email admins when a comment requires validation'] = 'Сообщать администратору когда появился комментарий для проверки';
$lang['Environment'] = 'Окружение';
$lang['Form'] = 'Действия';
$lang['Gallery URL'] = 'Адрес галереи';
$lang['Gallery title'] = 'Название галереи';
$lang['Grant selected groups'] = 'Разрешить доступ выбранным группам';
$lang['Grant selected users'] = 'Разрешить доступ выбранным пользователям';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'E-mail administratorima
$lang['Email admins when a comment requires validation'] = 'Email administratorima kada komentar treba overu';
$lang['Environment'] = 'Okruženje';
$lang['Form'] = 'Oblik';
$lang['Gallery URL'] = 'URL Galerije';
$lang['Gallery title'] = 'Naziv galerije';
$lang['Grant selected groups'] = 'Ovlasti odabrane grupe';
$lang['Grant selected users'] = 'Ovlasti odabrane korisnike';
-1
View File
@@ -85,7 +85,6 @@ $lang['Email admins when a valid comment is entered'] = 'Poslať e-mail administ
$lang['Email admins when a comment requires validation'] = 'Poslať e-mail administrátorom pri vložení nového komentára vyžadujúceho schválenie.';
$lang['Environment'] = 'Prostredie';
$lang['Form'] = 'Formulár';
$lang['Gallery URL'] = 'URL galérie';
$lang['Gallery title'] = 'Názov galérie';
$lang['Grant selected groups'] = 'Povoliť vybrané skupiny';
$lang['Grant selected users'] = 'Povoliť vybraných používateľov';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Пошаљи елект
$lang['Email admins when a comment requires validation'] = 'Пошаљи електронску пошту администраторима када коментар треба оверу';
$lang['Environment'] = 'Окружење';
$lang['Form'] = 'Облик';
$lang['Gallery URL'] = 'УРЛ галерије';
$lang['Gallery title'] = 'Назив галерије';
$lang['Grant selected groups'] = 'Овласти одабране групе';
$lang['Grant selected users'] = 'Овласти одабране кориснике';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Sänd mail till admin n
$lang['Email admins when a comment requires validation'] = 'Sänd mail till admin när en kommentar väntar på godkännande';
$lang['Environment'] = 'Miljö';
$lang['Form'] = 'Formulär';
$lang['Gallery URL'] = 'Galleri URL';
$lang['Gallery title'] = 'Galleri titel';
$lang['Grant selected groups'] = 'Tillåt markerade grupper';
$lang['Grant selected users'] = 'Tillåt markerade användare';
-1
View File
@@ -82,7 +82,6 @@ $lang['Email admins when a valid comment is entered'] = 'Yeni yorum eklendiginde
$lang['Email admins when a comment requires validation'] = 'Yorum onayı oldugunda yöneticiye e-posta gönder';
$lang['Environment'] = 'Ortam / Çevre';
$lang['Form'] = 'Biçim';
$lang['Gallery URL'] = 'Galleri URL';
$lang['Gallery title'] = 'Galleri Başlığı';
$lang['Grant selected groups'] = 'Seçilen grupların kabulu';
$lang['Grant selected users'] = 'Seçilen kullanıcıların kabulu';
-1
View File
@@ -288,7 +288,6 @@ $lang['Forbidden'] = 'Заборонено';
$lang['Form'] = 'Форма';
$lang['FTP + Synchronization'] = 'FTP + Синхронізація';
$lang['Gallery title'] = 'Заголовок галереї';
$lang['Gallery URL'] = 'URL галереї';
$lang['GD library is missing'] = 'GD бібліотека відсутня';
$lang['GD version'] = 'GD версія';
$lang['General statistics'] = 'Загальна статистика';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = 'Gởi email cho quản
$lang['Email admins when a comment requires validation'] = 'Gởi email cho quản trị khi có một mời bình cần được xác nhận';
$lang['Environment'] = 'Môi trường';
$lang['Form'] = 'Form';
$lang['Gallery URL'] = 'Địa chỉ website của gallery';
$lang['Gallery title'] = 'Tiêu đề của gallery';
$lang['Grant selected groups'] = 'Cấp cho các nhóm đã chọn';
$lang['Grant selected users'] = 'Cấp cho các thành viên đã chọn';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = '当用户发表评论
$lang['Email admins when a comment requires validation'] = '当用户要求确认他的评论时通知管理员';
$lang['Environment'] = '环境';
$lang['Form'] = '表单';
$lang['Gallery URL'] = '图库URL';
$lang['Gallery title'] = '图库标题';
$lang['Grant selected groups'] = '对所选组授权';
$lang['Grant selected users'] = '对所选用户授权';
-1
View File
@@ -84,7 +84,6 @@ $lang['Email admins when a valid comment is entered'] = '當用戶發表評論
$lang['Email admins when a comment requires validation'] = '當用戶要求確認他的評論時通知管理員';
$lang['Environment'] = '環境';
$lang['Form'] = '表單';
$lang['Gallery URL'] = '圖庫URL';
$lang['Gallery title'] = '圖庫標題';
$lang['Grant selected groups'] = '對所選組授權';
$lang['Grant selected users'] = '對所選用戶授權';