Index: /extensions/adult_content/admin/admin.php
===================================================================
--- /extensions/adult_content/admin/admin.php (revision 21056)
+++ /extensions/adult_content/admin/admin.php (revision 21057)
@@ -16,5 +16,4 @@
$newconf_plugin=array();
$newconf_plugin['menublock_for_guest'] = (isset($_POST['menublock_for_guest'])) ? true : false;
- $newconf_plugin['block_on_index'] = (isset($_POST['block_on_index'])) ? true : false;
$newconf_plugin['manage_what'] = (isset($_POST['manage_what'])) ? $_POST['manage_what'] : 'both';
$query = '
@@ -33,15 +32,13 @@
$check='checked="checked"';
if ($conf_ad_c['menublock_for_guest']=='true') { $menublock=$check; } else { $menublock=NULL; }
-if ($conf_ad_c['block_on_index']=='true') { $index=$check; } else { $index=NULL; }
-$disabled='disabled="disabled"';
- $template->assign(
- array(
- 'AD_C_manage_what' => $conf_ad_c['manage_what'],
- 'AD_C_menublock_for_guest' => $menublock,
- 'AD_C_block_on_index' => $index,
- 'AD_C_block_on_index_disabled' => $disabled,
- 'AD_C_LANG' => $user['language'],
- )
- );
+$template->assign(
+ array(
+ 'AD_C_manage_what' => $conf_ad_c['manage_what'],
+ 'AD_C_menublock_for_guest' => $menublock,
+ 'AD_C_LANG' => $user['language'],
+ )
+ );
+
+
$template->set_filename('plugin_admin_content', $ad_c->plugin_path.'admin/admin.tpl');
$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
Index: /extensions/adult_content/admin/admin.tpl
===================================================================
--- /extensions/adult_content/admin/admin.tpl (revision 21056)
+++ /extensions/adult_content/admin/admin.tpl (revision 21057)
@@ -11,8 +11,4 @@
- {'ad_c_block_on_index'|@translate}
-
- {'ad_c_block_on_index_error'|@translate}
-
{'ad_c_manage_what'|@translate}
+
+
+
+ {'NEW! Check the Plugin PWG Stuffs to add the disclaimer on the index/album pages'|@translate}
Index: /extensions/adult_content/class.inc.php
===================================================================
--- /extensions/adult_content/class.inc.php (revision 21056)
+++ /extensions/adult_content/class.inc.php (revision 21057)
@@ -118,44 +118,4 @@
}
- function set_block_on_index ()
- {
- $this->loading_lang();
- global $page, $template, $user, $conf;
-
- if (isset($page['section']) and $page['section'] == 'categories')
-
- {
- ////////////lié à quoi/////
- $query = '
-SELECT id FROM '.GROUPS_TABLE.'
- WHERE name IN (\'+18\')
-;';
- $data_18 = pwg_db_fetch_array(pwg_query($query));
- $query = '
-SELECT id FROM '.GROUPS_TABLE.'
- WHERE name IN (\'16-17\')
-;';
- $data_16 = pwg_db_fetch_array(pwg_query($query));
- $query = '
-SELECT id FROM '.GROUPS_TABLE.'
- WHERE name IN (\'nothing\')
-;';
- $data_no = pwg_db_fetch_array(pwg_query($query));
- $n_query = '
-SELECT COUNT(*) AS result FROM '.USER_GROUP_TABLE.'
- WHERE group_id IN (\''.$data_18['id'].'\',\''.$data_16['id'].'\',\''.$data_no['id'].'\') AND user_id IN (\''.$user['id'].'\')
-;';
- $data_user = pwg_db_fetch_array(pwg_query($n_query));
- $is_grouped = $data_user['result'];
-
- if ( $is_grouped == 0 and $user['username'] !== '16' and $user['username'] !== '18')
- {
- $template->set_filename('ac_block', realpath($this->get_template('block.tpl') ) );
- $begin = 'PLUGIN_INDEX_CONTENT_BEFORE';
- $end = 'PLUGIN_INDEX_CONTENT_AFTER';
- $template->concat($begin, $template->parse('ac_block', true));
- }
- }
- }
function placer_identification($menu_ref_arr)
{
@@ -324,5 +284,5 @@
'path' => PHPWG_PLUGINS_PATH . AC_NAME . '/stuffs_module/',
'name' => l10n('ac_text'),
- 'description' => l10n('ac_stuffs_description'),
+ 'description' => l10n('Disclaimer for the guest, with the ability to choose its age'),
)
);
Index: /extensions/adult_content/language/cs_CZ/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/cs_CZ/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/cs_CZ/plugin.lang.php (revision 21057)
@@ -38,7 +38,4 @@
$lang['ac_def'] = 'Chcete změnit svůj stav?';
-$lang['ad_c_block_on_index_error_2'] = 'Vyžaduje PWG_Stuffs ve verzi alespoň 2.1.l';
-$lang['ad_c_block_on_index_error'] = 'Momentálně není k dispozici';
-$lang['ad_c_block_on_index'] = 'Zobrazit leták na hlavní stránce? (Vyžaduje plugin PWG_Stuffs)';
$lang['ad_c_linktolang'] = 'Jděte do jazykového souboru Adult Content (nutno mít povolený LocalFiles Editor)';
$lang['ad_c_manage_both'] = 'erotický a pornografický obsah';
Index: /extensions/adult_content/language/da_DK/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/da_DK/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/da_DK/plugin.lang.php (revision 21057)
@@ -26,7 +26,4 @@
$lang['ac_user_text_16'] = 'Du er 16 eller 17 år gammel';
$lang['ac_user_text_18'] = 'Du er 18 år eller ældre';
-$lang['ad_c_block_on_index'] = 'Se en brochure på hjemmesiden? (Kræver plugin\'en PWG_Stuffs)';
-$lang['ad_c_block_on_index_error'] = 'Ikke tilgængelig i øjeblikket';
-$lang['ad_c_block_on_index_error_2'] = 'Kræver som minimum PWG_Stuffs version 2.1.l';
$lang['ad_c_linktolang'] = 'Gå til Adult Contents sprogfil (kræver at LocalFiles Editor er aktiveret)';
$lang['ad_c_manage_both'] = 'erotisk og pornografisk indhold';
Index: /extensions/adult_content/language/de_DE/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/de_DE/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/de_DE/plugin.lang.php (revision 21057)
@@ -41,5 +41,4 @@
$lang['ac_user_text_16'] = 'Sie sind 16 oder 17 Jahre alt';
$lang['ac_user_text_18'] = 'Sie sind älter als 18 Jahre';
-$lang['ad_c_block_on_index_error'] = 'Zur Zeit nicht verfügbar';
$lang['ad_c_menublock_for_guest'] = 'Erlaube unregistrierten Benutzern das Alter auszuwählen?';
$lang['ad_c_send'] = 'Änderungen speichern';
@@ -51,6 +50,4 @@
Jede Person, die trotz eingehender Warnung, ihre Zustimmung zum betreten dieser Seite gibt, befreit diese Seite von allen Konsequenzen daraus. p>
Wenn ich eine dieser Zusagen nicht einhalte oder eine falsche Erklärung abgebe, kann ich eventuell die Gesetze meines Landes verletzen, und übernehme damit die volle Verantwortung für mein Handeln B>. Ich erkläre hiermit, vollständig über die angebotenen Inhalte informiert worden zu sein und verzichte auf irgendwelche rechtlichen Schritte gegen den Provider und den Administrator dieser Webseite. Ich lese aufmerksam vorstehende Absätze und gebe elektronisch mein Einverständnis, indem ich mein entsprechendes Alter anklicke.';
-$lang['ad_c_block_on_index_error_2'] = 'Die minimale PWG_Stuffs Version die erforderlich ist, ist 2.1.l';
-$lang['ad_c_block_on_index'] = 'Sehen Sie einen Flyer auf der Homepage? (Benötigt Plugin PWG_Stuffs)';
$lang['ad_c_linktolang'] = 'Gehen Sie auf die Sprach-Datei von nicht jugendfreien Inhalten (Benötigen LocalFiles Editor aktiviert)';
$lang['ad_c_manage_both'] = 'erotische und pornografische Inhalte';
Index: /extensions/adult_content/language/el_GR/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/el_GR/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/el_GR/plugin.lang.php (revision 21057)
@@ -53,7 +53,4 @@
$lang['ac_user_text_16'] = 'Είστε 16 ή 17 ετών';
$lang['ac_user_text_18'] = 'Είστε άνω των 18 ετών';
-$lang['ad_c_block_on_index_error_2'] = 'Το ελάχιστο που απαιτείται είναι PWG_Stuffs έκδοση 2.1.l';
-$lang['ad_c_block_on_index_error'] = 'Δεν διατίθεται προς το παρόν';
-$lang['ad_c_block_on_index'] = 'Είδατε ένα φυλλάδιο στην αρχική σελίδα; (Απαιτεί το πρόσθετο PWG_Stuffs)';
$lang['ad_c_howitworks'] = 'Η αρχή αυτού του πρόσθετου είναι να βοηθήσει στη διαχείριση του περιεχομένου για ενήλικες (μπορεί επίσης να προσαρμοστεί για βίαιο περιεχόμενο). Για να γίνει αυτό, το πρόσθετο διαχειρίζεται τους επισκέπτες και / ή τους χρήστες που θέλετε, σύμφωνα με τον ορισμό σας των παραμέτρων του πρόσθετου.
Index: /extensions/adult_content/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/en_UK/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/en_UK/plugin.lang.php (revision 21057)
@@ -39,7 +39,4 @@
$lang['ad_c_menublock_for_guest'] = 'Allow unregistered users to select their age?';
-$lang['ad_c_block_on_index'] = 'View a flyer on the homepage? (Requires plugin PWG_Stuffs)';
-$lang['ad_c_block_on_index_error_2'] = 'The minimum PWG_Stuffs version required is 2.1.l';
-$lang['ad_c_block_on_index_error'] = 'Not available for now';
$lang['ad_c_manage_what'] = 'Select the type of content the plugin should manage :';
$lang['ad_c_manage_eroticonly'] = 'erotic content only';
@@ -125,3 +122,7 @@
";
$lang['ad_c_linktolang']="Go to the language file of Adult Content (need LocalFiles Editor enabled)";
+
+$lang['NEW! Check the Plugin PWG Stuffs to add the disclaimer on the index/album pages']="NEW! Check the Plugin PWG Stuffs to add the disclaimer on the index/album pages";
+$lang['Disclaimer for the guest, with the ability to choose its age to unlock the adult content']="Disclaimer for the guest, with the ability to choose its age";
+$lang['No options. Just check "Allow unregistered users to select their age?" on the Adult Content administration page']='No options. Just check "Allow unregistered users to select their age?" on the Adult Content administration page';
?>
Index: /extensions/adult_content/language/es_ES/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/es_ES/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/es_ES/plugin.lang.php (revision 21057)
@@ -38,7 +38,4 @@
$lang['ac_def'] = 'Usted quiere cambiar su estatuto ?';
-$lang['ad_c_block_on_index_error_2'] = 'La versión mínima de PWG_Stuffs requerida es la 2.1.l';
-$lang['ad_c_block_on_index_error'] = 'No disponible de momento';
-$lang['ad_c_block_on_index'] = 'Ver un folleto en la página principal? (Requiere el plugin PWG_Stuffs)';
$lang['ad_c_linktolang'] = 'Ir al archivo de lenguaje del Contenido para Adultos (se necesita tener habilitado el Editor LocalFiles)';
$lang['ad_c_manage_both'] = 'contenido erótico y pornográfico';
Index: /extensions/adult_content/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/fr_FR/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/fr_FR/plugin.lang.php (revision 21057)
@@ -39,7 +39,4 @@
$lang['ad_c_menublock_for_guest'] = 'Permettre aux visiteurs non-enregistrés de sélectionner leur âge ?';
-$lang['ad_c_block_on_index'] = 'Afficher un encart sur la page d\'accueil ? (Nécessite le plugin PWG Stuffs)';
-$lang['ad_c_block_on_index_error_2'] = 'PWG Stuffs dans une version supérieure à 2.1.l est nécessaire';
-$lang['ad_c_block_on_index_error'] = 'fonction non disponible pour l\'instant';
$lang['ad_c_manage_what'] = 'Le plugin gère le contenu';
@@ -84,4 +81,6 @@
$lang['ad_c_linktolang']="Lien vers le fichier langue d'Adult Content (Nécessite localFiles Editor)";
-$lang['ac_stuffs_description']="Charte pour le visiteur et choix de son âge"
+$lang['NEW! Check the Plugin PWG Stuffs to add the disclaimer on the index/album pages']="Nouveau ! Utilisez le plugin PWG STuffs pour ajouter la charte sur les pages d'accueil et d'albums";
+$lang['Disclaimer for the guest, with the ability to choose its age']="Charte pour le visiteur, avec la possibilité qu'il choisisse son âge";
+$lang['No options. Just check "Allow unregistered users to select their age?" on the Adult Content administration page']='Pas d\'options, juste cochez "Permettre aux visiteurs non-enregistrés de sélectionner leur âge" sur la page d\'administration d\'Adult content';
?>
Index: /extensions/adult_content/language/hu_HU/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/hu_HU/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/hu_HU/plugin.lang.php (revision 21057)
@@ -38,6 +38,4 @@
$lang['ac_def'] = 'Szeretné megváltoztatni a státuszát ?';
-$lang['ad_c_block_on_index_error_2'] = 'Legalább a PWG_Stuffs 2.1.l verziója szükséges';
-$lang['ad_c_block_on_index_error'] = 'Jelenleg nem érhető el';
$lang['ad_c_linktolang'] = 'Adult Content nyelvi fájl megnyitása (a LocalFiles Editort aktiválni kell)';
$lang['ad_c_manage_both'] = 'erotikus és pornográf tartalmat';
@@ -48,4 +46,3 @@
$lang['ad_c_msg_admin_1'] = 'A bővítmény beállítások mentése sikeres';
$lang['ad_c_send'] = 'Változások mentése';
-$lang['ad_c_block_on_index'] = 'Megtekinti az adatlapot a honlapon? (PWG_Stuffs bővítmény szükséges)';
?>
Index: /extensions/adult_content/language/it_IT/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/it_IT/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/it_IT/plugin.lang.php (revision 21057)
@@ -39,7 +39,4 @@
$lang['ad_c_menublock_for_guest'] = 'Permettere ai visitatori di selezionare la loro età?';
-$lang['ad_c_block_on_index'] = 'Visualizzare un flyer sulla home page ? (Necessita il plugin PWG Stuffs)';
-$lang['ad_c_block_on_index_error_2'] = 'PWG_Stuffs versione minima necessaria è 2.1.l';
-$lang['ad_c_block_on_index_error'] = 'funzione non disponibile attualmente';
$lang['ad_c_send'] = 'Salvare le modifiche';
$lang['ad_c_msg_admin_1'] = 'Configurazione del plugin aggiornata correttamente!';
Index: /extensions/adult_content/language/lv_LV/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/lv_LV/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/lv_LV/plugin.lang.php (revision 21057)
@@ -74,6 +74,3 @@
$lang['ad_c_manage_pornonly'] = 'tikai pornogrāfiska rakstura saturs';
$lang['ad_c_manage_eroticonly'] = 'tikai erotiska rakstura saturs';
-$lang['ad_c_block_on_index'] = 'Skatīt bukletu mājas lapā? (Nepieciešams PWG_Stuffs spraudnis) ';
-$lang['ad_c_block_on_index_error_2'] = 'Minimālā pieprasītā PWG_Stuffs versija ir 2.1';
-$lang['ad_c_block_on_index_error'] = 'Pagaidām nav pieejams';
?>
Index: /extensions/adult_content/language/pl_PL/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/pl_PL/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/pl_PL/plugin.lang.php (revision 21057)
@@ -43,6 +43,4 @@
$lang['ac_user_text_16'] = 'Masz 16 lub 17 lat';
$lang['ac_user_text_18'] = 'Masz więcej niż 18 lat';
-$lang['ad_c_block_on_index_error_2'] = 'Minimalna wymagana wersja PWG_Stuffs to 2.1';
-$lang['ad_c_block_on_index_error'] = 'Aktualnie niedostępne';
$lang['ad_c_linktolang'] = 'Idź do pliku language tego pluginu (wymagany LocalFiles Editor)';
$lang['ad_c_manage_both'] = 'zawartość erotyczna i pornograficzna';
Index: /extensions/adult_content/language/tr_TR/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/tr_TR/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/tr_TR/plugin.lang.php (revision 21057)
@@ -43,7 +43,4 @@
$lang['ac_user_text_16'] = 'Yaşınız 16 veya 17 dir';
$lang['ac_user_text_18'] = 'Yaşınız 18 \'den büyük';
-$lang['ad_c_block_on_index_error_2'] = 'PWG_Stuffs ekletisi en az sürüm 2.1.l gerektirir';
-$lang['ad_c_block_on_index_error'] = 'Şu an için kullanılamaz';
-$lang['ad_c_block_on_index'] = 'Ana sayfada bir ilan görüntülensin mi? (PWG_Stuffs ekletisi gerektirir)';
$lang['ad_c_linktolang'] = 'Adult Content eklentisi dil dosyasına gidiniz (LocalFiles düzenleyicisinin etkin olması gerekir)';
$lang['ad_c_manage_both'] = 'erotik ve pornografik içerik';
Index: /extensions/adult_content/language/uk_UA/plugin.lang.php
===================================================================
--- /extensions/adult_content/language/uk_UA/plugin.lang.php (revision 21056)
+++ /extensions/adult_content/language/uk_UA/plugin.lang.php (revision 21057)
@@ -33,5 +33,4 @@
$lang['ac_user_text_16'] = 'Вам 16 або 17 років';
$lang['ac_user_text_18'] = 'Вам більш ніж 18 років';
-$lang['ad_c_block_on_index_error'] = 'Не доступний зараз';
$lang['ad_c_linktolang'] = 'Перейти до мовного файлу із вмістом для дорослих (необхідно ввімкнути LocalFiles Editor)';
$lang['ad_c_manage_both'] = 'еротичний і порнографічний вміст';
@@ -58,6 +57,4 @@
$lang['ac_text'] = 'Ця галерея містить зображення, для зрілих осіб та\або дорослих.';
$lang['ac_user_no'] = 'ви не бажаєте активувати цей тип вмісту';
-$lang['ad_c_block_on_index_error_2'] = 'Мінімальна необхідна версія PWG_Stuffs 2.1.l';
-$lang['ad_c_block_on_index'] = 'Переглянути листівку на головній сторінці? (Потрібен плаґін PWG_Stuffs)';
$lang['ad_c_manage_what'] = 'Виберіть тип вмісту, яким плаґін повинен керувати:';
$lang['ad_c_menublock_for_guest'] = 'Дозволити незареєстрованим користувачам вибирати свій вік?';
Index: /extensions/adult_content/main.inc.php
===================================================================
--- /extensions/adult_content/main.inc.php (revision 21056)
+++ /extensions/adult_content/main.inc.php (revision 21057)
@@ -31,8 +31,4 @@
//block on index
-/*
-global $conf;
-add_event_handler('loc_begin_index', array(&$adult_content, 'set_block_on_index'));
-*/
add_event_handler('get_stuffs_modules', array(&$adult_content, 'ac_stuffs_module'));
Index: /extensions/adult_content/maintain.inc.php
===================================================================
--- /extensions/adult_content/maintain.inc.php (revision 21056)
+++ /extensions/adult_content/maintain.inc.php (revision 21057)
@@ -48,9 +48,9 @@
/////////////Config plugin
- $config_start=array('menublock_for_guest'=>true,'block_on_index'=>false,'manage_what'=>'both');
+ $config_start=array('menublock_for_guest'=>true,'manage_what'=>'both');
$q = '
INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
VALUES
- ("ad_c_plugin" , "'.pwg_db_real_escape_string(serialize($config_start)).'" , "Plugin adult_content : menublock_for_guest, block_on_index, manage_what");';
+ ("ad_c_plugin" , "'.pwg_db_real_escape_string(serialize($config_start)).'" , "Plugin adult_content : menublock_for_guest, manage_what");';
pwg_query($q);
@@ -124,9 +124,9 @@
if ( $exist == 0 )
{
- $config_start=array('menublock_for_guest'=>true,'block_on_index'=>false,'manage_what'=>'both');
+ $config_start=array('menublock_for_guest'=>true,'manage_what'=>'both');
$q = '
INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
VALUES
- ("ad_c_plugin" , "'.pwg_db_real_escape_string(serialize($config_start)).'" , "Plugin adult_content : menublock_for_guest, block_on_index, manage_what");';
+ ("ad_c_plugin" , "'.pwg_db_real_escape_string(serialize($config_start)).'" , "Plugin adult_content : menublock_for_guest, manage_what");';
pwg_query($q);
}
@@ -140,10 +140,10 @@
$nbr=count($cf);
- if ($nbr!=3)
+ if ($nbr!=2)
{
- $config_start=array('menublock_for_guest'=>true,'block_on_index'=>false,'manage_what'=>'both');
+ $config_start=array('menublock_for_guest'=>true,'manage_what'=>'both');
$q = '
UPDATE ' . CONFIG_TABLE . ' SET
- param="ad_c_plugin", value="'.pwg_db_real_escape_string(serialize($config_start)).'", comment="Plugin adult_content : menublock_for_guest, block_on_index, manage_what"
+ param="ad_c_plugin", value="'.pwg_db_real_escape_string(serialize($config_start)).'", comment="Plugin adult_content : menublock_for_guest, manage_what"
WHERE param IN (\'ad_c_plugin\');';
pwg_query($q);
Index: /extensions/adult_content/stuffs_module/config.inc.php
===================================================================
--- /extensions/adult_content/stuffs_module/config.inc.php (revision 21056)
+++ /extensions/adult_content/stuffs_module/config.inc.php (revision 21057)
@@ -6,5 +6,5 @@
$display_options['on_picture'] = false;
-$template->assign('MODULE_OPTIONS', '
'.l10n('ac_stuffs_info_param').'
'); +$template->assign('MODULE_OPTIONS', ''.l10n('No options. Just check "Allow unregistered users to select their age?" on the Adult Content administration page').'
'); ?>