Changeset 32135

Timestamp:

Apr 28, 2020, 2:37:00 AM (4 years ago)

Author:

ddtddt

Message:

[manage_properties_photos]

Location:

extensions/manage_properties_photos

Files:

• admin.php (modified) (12 diffs)
• admin/admin.tpl (modified) (11 diffs)
• admin/index.php (modified) (1 diff)
• include/function.aip.inc.php (modified) (5 diffs)
• include/index.php (added)
• index.php (modified) (1 diff)
• initadmin.php (modified) (6 diffs)
• initpicture.php (modified) (3 diffs)
• js (added)
• js/index.php (added)
• js/jquery-ui-timepicker-addon.js (added)
• language/el_GR/index.php (modified) (1 diff)
• language/en_UK/index.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/index.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• language/index.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.class.php (modified) (7 diffs)
• mmp.tpl (modified) (1 diff)

extensions/manage_properties_photos/admin.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -33 +33 @@
 
 //-------------------------------------------------------- sections definitions
+
+$template->assign(array(
+  'ADD_PROP_PHOTO_PATH'=> get_root_url() . ADD_PROP_PHOTO_PATH,
+  ));
+
+
 if (!isset($_GET['tab']))
     $page['tab'] = 'define_properties';
@@ -42 +48 @@
     $tabsheet = new tabsheet();
     $tabsheet->add('addip', l10n('Property'), ADD_PROP_PHOTO_ADMIN . '-define_properties');
+        $tabsheet->add('config', l10n('Configuration'), ADD_PROP_PHOTO_ADMIN . '-config');
     $tabsheet->select($page['tab']);
     $tabsheet->assign();
@@ -67 +74 @@
     ));
     
-    $PAED = pwg_db_fetch_assoc(pwg_query("SELECT state FROM " . PLUGINS_TABLE . " WHERE id = 'ExtendedDescription';"));
-    if($PAED['state'] == 'active'){
+        if (isset($pwg_loaded_plugins['ExtendedDescription'])){
         add_event_handler('AP_render_content', 'get_user_language_desc');
                 $template->assign('useED',1);
@@ -78 +84 @@
     if (pwg_db_num_rows($tab_add_info_one_photo)) {
         while ($info_photos = pwg_db_fetch_assoc($tab_add_info_one_photo)) {
-
-            $d = data_info_photos($id_img, $info_photos['id_prop_pho']);
-            $row = pwg_db_fetch_assoc($d);
-
-            $items = array(
-                'IDPHO' => $_GET['image_id'],
-                'IDINFOPHO' => $info_photos['id_prop_pho'],
-                'AIPWORDING' => trigger_change('AP_render_content',$info_photos['wording']),
-                'AIPDATA' => $row['data'],
-            );
-
+                        if($info_photos['Typ']==2){
+                                $d = data_info_photosdate($id_img, $info_photos['id_prop_pho']);
+                                $row = pwg_db_fetch_assoc($d);
+
+                                $items = array(
+                                        'IDPHO' => $_GET['image_id'],
+                                        'IDINFOPHO' => $info_photos['id_prop_pho'],
+                                        'AIPWORDING' => trigger_change('AP_render_content',$info_photos['wording']),
+                                        'AIPDATA' => $row['datadate'],
+                                        'AIPTYP' => $info_photos['Typ'],
+                                );
+                                if($info_photos['wording']=="**delpho**"){
+                                        $items['AIPWORDING'] =l10n('Delete photo');
+                                }
+                        }else{
+                                $d = data_info_photos($id_img, $info_photos['id_prop_pho']);
+                                $row = pwg_db_fetch_assoc($d);
+
+                                $items = array(
+                                        'IDPHO' => $_GET['image_id'],
+                                        'IDINFOPHO' => $info_photos['id_prop_pho'],
+                                        'AIPWORDING' => trigger_change('AP_render_content',$info_photos['wording']),
+                                        'AIPDATA' => $row['data'],
+                                        'AIPTYP' => $info_photos['Typ'],
+                                );
+                                if($info_photos['Typ']==4||$info_photos['Typ']==5){
+                                        $items['AIPSELECT']=unserialize($info_photos['dataprop']);
+                                        foreach ($items['AIPSELECT'] as $key => $dataselect){
+                                                $items['AIPSELECTTRANS'][] = trigger_change('AP_render_content',$dataselect);
+                                        }
+                                }
+                        }
             $template->append('info_photos', $items);
         }
@@ -109 +136 @@
                 $query = 'INSERT ' . $prefixeTable . 'add_properties_photos_data(id_img,id_prop_pho,data) VALUES (' . $id_img . ',' . $id_prop_pho . ',"' . $data . '");';
                 pwg_query($query);
-            }
-            
+            }    
+        }
+                        foreach ($_POST['datadate'] AS $id_prop_pho => $data) {
+            $q = 'SELECT 1 FROM ' . ADD_PROP_PHOTO_DATADATE_TABLE . ' WHERE id_img=' . $id_img . ' AND id_prop_pho=' . $id_prop_pho;
+            $test = pwg_query($q);
+            $row = pwg_db_fetch_assoc($test);
+            if (count($row) > 0) {
+                if ($data != '') {
+                    $query = 'UPDATE ' . $prefixeTable . 'add_properties_photos_datadate SET datadate="' . $data . '" WHERE id_img=' . $id_img . ' AND id_prop_pho=' . $id_prop_pho;
+                    pwg_query($query);
+                } else {
+                    $query = 'DELETE FROM ' . $prefixeTable . 'add_properties_photos_datadate WHERE id_img=' . $id_img . ' AND id_prop_pho=' . $id_prop_pho;
+                    pwg_query($query);
+                }
+            } else if ($data != '') {
+                $query = 'INSERT ' . $prefixeTable . 'add_properties_photos_datadate(id_img,id_prop_pho,datadate) VALUES (' . $id_img . ',' . $id_prop_pho . ',"' . $data . '");';
+                pwg_query($query);
+            }   
         }
         $redirect_url = ADD_PROP_PHOTO_ADMIN . '-iap&amp;image_id=' . $id_img;
@@ -122 +165 @@
         $admin_base_url = ADD_PROP_PHOTO_ADMIN . '-define_properties';
         $template->assign(
-                'addinfotemplate', array(
-            'addinfo' => l10n('addinfo'),
-       ));
-        
-    $PAED = pwg_db_fetch_assoc(pwg_query("SELECT state FROM " . PLUGINS_TABLE . " WHERE id = 'ExtendedDescription';"));
-    if($PAED['state'] == 'active'){
+            'addinfotemplate', array(
+                                'addinfo' => l10n('addinfo'),
+                ));
+                $maxfields = (isset($conf['mpp_max_fields'])) ? $conf['mpp_max_fields'] : '5';
+        $template->assign('MPPMAXFIELD',$maxfields);
+                
+    if (isset($pwg_loaded_plugins['ExtendedDescription'])){
         add_event_handler('AP_render_content', 'get_user_language_desc');
                 $template->assign('useED',1);
@@ -139 +183 @@
         if (pwg_db_num_rows($tab_info_photos)) {
             while ($info_photos = pwg_db_fetch_assoc($tab_info_photos)) {
+                                $items = array(
+                    'IDINFOPHO' => $info_photos['id_prop_pho'],
+                    'AIPORDER' => $info_photos['orderprop'],
+                    'AIPACTIVE' => $info_photos['active'],
+                    'AIPEDIT' => $info_photos['edit'],
+                    'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
+                    'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho']
+                                );
                 if($info_photos['id_prop_pho']==1){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Author'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                                    $items['AIPWORDING'] = l10n('Author');
                 }else if($info_photos['id_prop_pho']==2){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Created on'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                                        $items['AIPWORDING'] = l10n('Created on');
                 }else if($info_photos['id_prop_pho']==3){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Posted on'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Posted on');
                 }else if($info_photos['id_prop_pho']==4){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Dimensions'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Dimensions');
                 }else if($info_photos['id_prop_pho']==5){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('File'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('File');
                 }else if($info_photos['id_prop_pho']==6){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Filesize'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Filesize');
                 }else if($info_photos['id_prop_pho']==7){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Tags'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Tags');
                 }else if($info_photos['id_prop_pho']==8){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Albums'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Albums');
                 }else if($info_photos['id_prop_pho']==9){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Visits'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Visits');
                 }else if($info_photos['id_prop_pho']==10){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Average'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                                        $items['AIPWORDING'] = l10n('Average');
                 }else if($info_photos['id_prop_pho']==11){
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => l10n('Who can see this photo?'),
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                    $items['AIPWORDING'] = l10n('Who can see this photo?');
                 }else{
-                    $items = array(
-                        'IDINFOPHO' => $info_photos['id_prop_pho'],
-                        'AIPWORDING' => trigger_change('AP_render_content',$info_photos['wording']),
-                        'AIPWORDING2' => $info_photos['wording'],
-                        'AIPORDER' => $info_photos['orderprop'],
-                        'AIPACTIVE' => $info_photos['active'],
-                        'AIPEDIT' => $info_photos['edit'],
-                        'U_DELETE' => $admin_base_url . '&amp;delete=' . $info_photos['id_prop_pho'],
-                        'U_HIDE' => $admin_base_url . '&amp;hide=' . $info_photos['id_prop_pho'],
-                        'U_SHOW' => $admin_base_url . '&amp;show=' . $info_photos['id_prop_pho'],
-                    );
+                                        if($info_photos['dataprop']=="DeletePhoto" and $info_photos['wording'] ="**delpho**"){
+                                                $items['AIPWORDING'] = l10n('Delete photo');
+                                        }else{
+                                                $items['AIPWORDING'] = trigger_change('AP_render_content',$info_photos['wording']);     
+                                        }
+                    $items['AIPWORDING2'] =  $info_photos['wording'];
+                                        $items['U_DELETE'] =  $admin_base_url . '&amp;delete=' . $info_photos['id_prop_pho'];
+                                        $items['AIPTYP'] =  $info_photos['Typ'];
+                                        if($info_photos['Typ']==4||$info_photos['Typ']==5){
+                                                        $items['AIPDATAPROP'] =  json_encode(unserialize($info_photos['dataprop']));
+                                        }
+                                        if($info_photos['Typ']==3||$info_photos['Typ']==6){
+                                                        $items['AIPDATAPROP'] =  $info_photos['dataprop'];
+                                        }                                       
                 }        
                 $template->append('info_photos', $items);
             }
+                        
+                        $idexifone = pwg_db_fetch_assoc(pwg_query("SELECT MIN(id) as id FROM " . IMAGES_TABLE .";"));
+                        $idexif = (isset($conf['mpp_idexif'])) ? $conf['mpp_idexif'] : $idexifone['id'];
+                        $filename = pwg_db_fetch_assoc(pwg_query("SELECT path FROM " . IMAGES_TABLE . " WHERE id = '".$idexif."';"));
+                        $exif = exif_read_data($filename['path']);
+                                foreach ($exif as $key => $section){
+                                        if(is_array($section)){
+                                                $i=0;
+                                        foreach ($section as $name => $value){
+                                                if($i==0){
+                                                        $items['RM_AFF'] = $key;
+                                                }else{
+                                                        $items['RM_AFF'] = '';
+                                                }
+                                                $items['RM_SECTION'] = $key;
+                                                $items['RM_KEY'] = $name;
+                                                $template->append('rm_exif', $items);
+                                                $i++;
+                                        }
+                                }else{
+                                        $items['RM_SECTION'] = '1';
+                                        $items['RM_KEY'] = $key;
+                                        $items['RM_VALUE'] = $section;
+                                        $template->append('rm_exif', $items);
+                                }
+                        }
+                        $iptc_result = array();
+                        $imginfo = array();
+                        getimagesize($filename['path'], $imginfo);
+                        if (isset ($imginfo['APP13'])){
+                         $iptc = iptcparse($imginfo['APP13']);
+                          if (is_array($iptc)){
+                                foreach (array_keys($iptc) as $iptc_key){
+                                        if (isset($iptc[$iptc_key][0])){
+                                                $iptc_result[$iptc_key] = $value;
+                                        }
+                                }
+                          }
+                          $keys = array_keys($iptc_result);
+                          sort($keys);
+                          foreach ($keys as $key){
+                                $items['RM_KEY'] = $key;
+                                $template->append('rm_iptc', $items);
+                          }
+                        }
         }
         
@@ -283 +295 @@
 
         if (isset($_POST['submitaddAIP'])) {
+                        if ($_POST['inserwording'] == '') {
+                        $_SESSION['page_errors'] = array(l10n('Wording isn\'t empty'));
+                        redirect($admin_base_url);
+                        }
+                        if ($_POST['typ'] == '4'||$_POST['typ'] == '5') {
+                        $select= serialize($_POST['mytext']);
+                        }
+                        if ($_POST['typ'] == '3') {
+                        $select= $_POST['selectexif'];
+                        }
+                        if ($_POST['typ'] == '6') {
+                        $select= $_POST['selectiptc'];
+                        }
             if (!isset($_POST['inseractive'])) {
                 $_POST['inseractive'] = 0;
@@ -290 +315 @@
                 $row = pwg_db_fetch_assoc($result);
                 $or = ($row['MAX(orderprop)'] + 1);
-
-                $q = '
-                INSERT INTO ' . $prefixeTable . 'add_properties_photos(wording,orderprop,active,edit)VALUES ("' . $_POST['inserwording'] . '","' . $or . '","' . $_POST['inseractive'] . '",1);';
-                pwg_query($q);
+                                        if ($_POST['typ'] == '4'||$_POST['typ'] == '3'||$_POST['typ'] == '5'||$_POST['typ'] == '6') {
+                                                $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(wording,orderprop,active,edit,Typ,dataprop)VALUES ("' . $_POST['inserwording'] . '","' . $or . '","' . $_POST['inseractive'] . '",1,"' . $_POST['typ'] . '",\''. $select .'\');';
+                                                pwg_query($q);
+                                        }else{
+                                                $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(wording,orderprop,active,edit,Typ)VALUES ("' . $_POST['inserwording'] . '","' . $or . '","' . $_POST['inseractive'] . '",1,"' . $_POST['typ'] . '");';
+                                                pwg_query($q);
+                                        }
                 $_SESSION['page_infos'] = array(l10n('Property photo add'));
             } else {
-                $q = '
-                UPDATE ' . $prefixeTable . 'add_properties_photos'
+                                        if ($_POST['typ'] == '4'||$_POST['typ'] == '3'||$_POST['typ'] == '5'||$_POST['typ'] == '6') {
+                                          $q = '
+                                          UPDATE ' . $prefixeTable . 'add_properties_photos'
+                        . ' set wording ="' . $_POST['inserwording'] . '" '
+                        . ' ,active =' . $_POST['inseractive']
+                                                . ' ,Typ =' . $_POST['typ']
+                                                . ' ,dataprop =\'' . $select . '\' '
+                        . ' WHERE id_prop_pho=' . $_POST['invisibleID'] . ';';
+                                        }else{
+                                          $q = '
+                                          UPDATE ' . $prefixeTable . 'add_properties_photos'
                         . ' set wording ="' . $_POST['inserwording'] . '" '
                         . ' ,active=' . $_POST['inseractive']
+                                                . ' ,Typ =' . $_POST['typ']
                         . ' WHERE id_prop_pho=' . $_POST['invisibleID'] . ';';
+                                        }
                 pwg_query($q);
                 $_SESSION['page_infos'] = array(l10n('Property photo update'));
@@ -313 +352 @@
             $query = 'DELETE FROM ' . ADD_PROP_PHOTO_DATA_TABLE . ' WHERE id_prop_pho = ' . $_GET['delete'] . ';';
             pwg_query($query);
+                        $query = 'DELETE FROM ' . ADD_PROP_PHOTO_DATADATE_TABLE . ' WHERE id_prop_pho = ' . $_GET['delete'] . ';';
+            pwg_query($query);
 
             $_SESSION['page_infos'] = array(l10n('Property delete'));
@@ -331 +372 @@
 
         break;
+                case 'config':
+                $maxfields = (isset($conf['mpp_max_fields'])) ? $conf['mpp_max_fields'] : '5';
+        $template->assign('MPPMAXFIELD',$maxfields);
+                $idexif = (isset($conf['mpp_idexif'])) ? $conf['mpp_idexif'] : '';
+        $template->assign('MPPIDEXIF',$idexif);
+        $admin_base_url = ADD_PROP_PHOTO_ADMIN . '-config';
+                        $template->assign(
+                                'mppconfig', array(
+                                        'a' => 'a',
+                        ));
+                                
+                $delpho = pwg_db_fetch_assoc(pwg_query('SELECT dataprop FROM ' . ADD_PROP_PHOTO_TABLE.' WHERE dataprop="DeletePhoto";'));
+                if(empty($delpho)){
+                        $template->assign(
+                                'mppconfig', array(
+                                        'ADDPHOAC' => 'actiondelphoadd',
+                        ));
+                }
+                if (isset($_POST['submitadddelpho'])){
+                        $result = pwg_query('SELECT MAX(orderprop) FROM '. ADD_PROP_PHOTO_TABLE );
+                        $row = pwg_db_fetch_assoc($result);
+                        $or = ($row['MAX(orderprop)'] + 1);
+                        $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(wording,orderprop,active,edit,Typ,dataprop)VALUES ("**delpho**","' . $or . '","1",1,"2","DeletePhoto");';
+                        pwg_query($q);
+                        header('Location:'.ADD_PROP_PHOTO_ADMIN . '-config');
+                }
+                if (isset($_POST['submitremovedelpho'])){
+                        $iddelpho = pwg_db_fetch_assoc(pwg_query('SELECT id_prop_pho FROM '. ADD_PROP_PHOTO_TABLE.' where dataprop="DeletePhoto";'));
+                        pwg_query('DELETE FROM ' . ADD_PROP_PHOTO_TABLE . ' where dataprop ="DeletePhoto";');
+                        $query = 'DELETE FROM ' . ADD_PROP_PHOTO_DATADATE_TABLE . ' WHERE id_prop_pho = ' . $iddelpho['id_prop_pho'] . ';';
+            pwg_query($query);
+                        header('Location:'.ADD_PROP_PHOTO_ADMIN . '-config');
+                }
+                $descpho = pwg_db_fetch_assoc(pwg_query('SELECT dataprop FROM ' . ADD_PROP_PHOTO_TABLE.' WHERE dataprop="movedescription";'));
+                if(empty($descpho)){
+                        $vars['MOVEDESC']='actionmovedesc';
+                        $template->append('mppconfig', $vars, true);
+                }
+                if (isset($_POST['submitmovedesc'])){
+                        $result = pwg_query('SELECT MAX(orderprop) FROM '. ADD_PROP_PHOTO_TABLE );
+                        $row = pwg_db_fetch_assoc($result);
+                        $or = ($row['MAX(orderprop)'] + 1);
+                        $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(wording,orderprop,active,edit,Typ,dataprop)VALUES ("Description","' . $or . '","0",0,"1","movedescription");';
+                        pwg_query($q);
+                        header('Location:'.ADD_PROP_PHOTO_ADMIN . '-config');
+                }
+                if (isset($_POST['submitdefaultdesc'])){
+                        pwg_query('DELETE FROM ' . ADD_PROP_PHOTO_TABLE . ' where dataprop ="movedescription";');
+                        header('Location:'.ADD_PROP_PHOTO_ADMIN . '-config');
+                }
+                if (isset($_POST['submitmppoption'])){
+                        conf_update_param('mpp_max_fields', $_POST['mppmaxfield']);
+                        conf_update_param('mpp_idexif', $_POST['mppitidexif']);
+                        header('Location:'.ADD_PROP_PHOTO_ADMIN . '-config');
+                }
+                break;
  }
 

extensions/manage_properties_photos/admin/admin.tpl

@@ -1 +1 @@
 {combine_script id='jquery.ui.sortable' require='jquery.ui' load='footer' path='themes/default/js/ui/minified/jquery.ui.sortable.min.js'}
 {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+{combine_script id='jquery.timepicker' require='jquery.ui.datepicker,jquery.ui.slider' load='footer' path=$ADD_PROP_PHOTO_PATH|@cat:"js/jquery-ui-timepicker-addon.js"}
+{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
+{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
+{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' path=$datepicker_language}
+{/if}
+
+{combine_script id='jquery.chosen' load='footer' path='themes/default/js/plugins/chosen.jquery.min.js'}
+{combine_css path="themes/default/js/plugins/chosen.css"}
+
+{combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
+{combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
+
+
 {footer_script}
 jQuery(document).ready(function(){
+
+  var x = 1;
+  var max_fields = $("#hideid").data('maxfield');
+ 
   jQuery(".drag_button").show();
   jQuery(".categoryLi").css("cursor","move");
@@ -41 +58 @@
     jQuery('#hideid').val(0);
     jQuery("textarea[name=inserwording]").focus();
+        jQuery('input[name=typ]').val(['1']);
+        jQuery('#mppselect').hide();
+        jQuery('#exifselect').hide();
+        jQuery('#iptcselect').hide();
+
   });
   
@@ -51 +73 @@
     var lib=$(this).data('lib');
     var hide=$(this).data('hide');
+        var typ=$(this).data('typ');
+        var dataprop=$(this).data('dataprop');
+                if(typ=='4'){
+                        jQuery('#exifselect').hide();
+                        jQuery('#iptcselect').hide();
+                        jQuery('input[name=typ]').val(['4']);
+                        jQuery('#mppselect').show();
+                        jQuery('#mytext5').parent('div').remove();
+                        jQuery('#mytext4').parent('div').remove();
+                        jQuery('#mytext3').parent('div').remove();
+                        jQuery('#mytext2').parent('div').remove();
+                        x = 1
+                        for (key in dataprop){
+                                if(key==0){
+                                        jQuery('#mytext1').val(dataprop[key]);
+                                }else{
+                                        x++; //text box increment
+                                        $(wrapper).append('<div><input type="text" id="mytext'+x+'" name="mytext[]" value="'+dataprop[key]+'"/><a href="#" class="remove_field"><span class="icon-trash"></span></a></div>');
+                                }
+                        }
+                }else if(typ=='2'){
+                        jQuery('#iptcselect').hide();
+                        jQuery('#exifselect').hide();
+                        jQuery('input[name=typ]').val(['2']);   
+                        jQuery('#mppselect').hide();
+                }else if(typ=='3'){
+                        jQuery('#iptcselect').hide();
+                        jQuery('#exifselect').show();
+                        jQuery('input[name=typ]').val(['3']);   
+                        jQuery('#mppselect').hide();
+                        jQuery('#selectexif').val(dataprop);
+                }else if(typ=='6'){
+                        jQuery('#iptcselect').show();
+                        jQuery('#exifselect').hide();
+                        jQuery('input[name=typ]').val(['6']);   
+                        jQuery('#mppselect').hide();
+                        jQuery('#selectiptc').val(dataprop);
+                }else if(typ=='5'){
+                        jQuery('#iptcselect').hide();
+                        jQuery('#exifselect').hide();
+                        jQuery('input[name=typ]').val(['5']);
+                        jQuery('#mppselect').show();
+                        jQuery('#mytext5').parent('div').remove();
+                        jQuery('#mytext4').parent('div').remove();
+                        jQuery('#mytext3').parent('div').remove();
+                        jQuery('#mytext2').parent('div').remove();
+                        x = 1
+                        for (key in dataprop){
+                                if(key==0){
+                                        jQuery('#mytext1').val(dataprop[key]);
+                                }else{
+                                        x++; //text box increment
+                                        $(wrapper).append('<div><input type="text" id="mytext'+x+'" name="mytext[]" value="'+dataprop[key]+'"/><a href="#" class="remove_field"><span class="icon-trash"></span></a></div>');
+                                }
+                        }
+                }else{
+                        jQuery('input[name=typ]').val(['1']);   
+                        jQuery('#mppselect').hide();
+                        jQuery('#exifselect').hide();
+                }
     jQuery("#add_info_edit").show();
     jQuery("#leg_add").hide();
@@ -89 +171 @@
       });
     });
+  jQuery('.radtyp').change(function(){
+        var typ=$(this).val();
+                if(typ==1){
+                        jQuery('#mppselect').hide();
+                        jQuery('#exifselect').hide();
+                        jQuery('#wordingta').show();
+                        jQuery('#iptcselect').hide();
+                }
+                if(typ==4||typ==5){
+                        jQuery('#mppselect').show();
+                        jQuery('#mytext1').val('');
+                        jQuery('#mytext5').parent('div').remove();
+                        jQuery('#mytext4').parent('div').remove();
+                        jQuery('#mytext3').parent('div').remove();
+                        jQuery('#mytext2').parent('div').remove();
+                        x = 1
+                        jQuery('#exifselect').hide();
+                        jQuery('#wordingta').show();
+                        jQuery('#iptcselect').hide();
+                }
+                if(typ==3){
+                        jQuery('#iptcselect').hide();
+                        jQuery('#mppselect').hide();
+                        jQuery('#exifselect').show();
+                        var exifval=jQuery('#selectexif').val();
+                        jQuery('#wordingta').show();
+                        if(jQuery('#aip_add').val()==''){
+                                jQuery('#aip_add').text(exifval);
+                        }
+                }
+                if(typ==6){
+                        jQuery('#iptcselect').show();
+                        jQuery('#mppselect').hide();
+                        jQuery('#exifselect').hide();
+                        var iptcval=jQuery('#selectiptc').val();
+                        jQuery('#wordingta').show();
+                        if(jQuery('#aip_add').val()==''){
+                                jQuery('#aip_add').text(iptcval);
+                        }
+                }
+                if(typ==2){
+                        jQuery('#iptcselect').hide();
+                        jQuery('#mppselect').hide();
+                        jQuery('#exifselect').hide();
+                        jQuery('#wordingta').show();
+                }
+    });
+                
+                var exifval2=jQuery('#selectexif').val();
+  jQuery('#selectexif').change(function(){
+                var exifval=jQuery('#selectexif').val();
+                if(jQuery('#aip_add').val()==''||jQuery('#aip_add').val()==exifval2){
+                        jQuery('#aip_add').text(exifval);
+                }
+                exifval2=exifval
+    });
+        
+    var max_fields = $("#hideid").data('maxfield');
+    var wrapper         = $(".input_fields_wrap");
+    var add_button      = $(".add_field_button");
+   
+    $(add_button).click(function(e){
+        e.preventDefault();
+        if(x < max_fields){
+            x++; //text box increment
+            $(wrapper).append('<div><input id="mytext'+x+'" type="text" name="mytext[]"/><a href="#" class="remove_field"><span class="icon-trash"></a></div>');
+        }
+    });
+   
+    $(wrapper).on("click",".remove_field", function(e){
+        e.preventDefault(); $(this).parent('div').remove(); x--;
+    })
+        
+        $('.dateSelect').datetimepicker({
+                numberOfMonths: 1,
+                changeMonth: true,
+                changeYear: true,
+                yearRange: "1900:+1",
+                dateFormat: "yy-mm-dd",
+                timeText: '{'selection'|@translate|escape:javascript}',
+                hourText: '{'Hour'|@translate|escape:javascript}',
+                minuteText: '{'Minute'|@translate|escape:javascript}',
+                currentText: '{'Now'|@translate|escape:javascript}',
+                closeText: '{'Validate'|@translate|escape:javascript}'
+    });
+        
 });
 {/footer_script}
@@ -94 +262 @@
 .mouse:hover{
     cursor:pointer;
+}
+.radtypspan{
+        margin-right:40px;
 }
 {/html_style}
@@ -109 +280 @@
             <fieldset>
                 <legend><span id="leg_add">{'Create new Property photo'|@translate}</span><span id="leg_edit">{'Edit Property photo'|@translate}</span></legend>
-                <input id="hideid" type="hidden" name="invisibleID" value="{$addinfo_edit2.AIPID}">
-                <p class="input">
+                <input id="hideid" data-maxfield="{$MPPMAXFIELD}" type="hidden" name="invisibleID" value="{$addinfo_edit2.AIPID}"></input>
+                                <input class="radtyp" id="radtyptex" type="radio" name="typ" value="1"> <span class="radtypspan">{'Text'|@translate}</span></input>
+                                <input class="radtyp" type="radio" name="typ" value="4"><span class="radtypspan"> {'select'|@translate}</span></input>
+                                <input class="radtyp" type="radio" name="typ" value="5"><span class="radtypspan"> {'radio'|@translate}</span></input>
+                                <input class="radtyp" type="radio" name="typ" value="2"><span class="radtypspan"> {'date'|@translate}</span></input>
+                                <input class="radtyp" type="radio" name="typ" value="3"><span class="radtypspan"> {'exif'|@translate}</span></input>
+                                <input class="radtyp" type="radio" name="typ" value="6"><span class="radtypspan"> {'IPTC'|@translate}</span></input>
+                                
+                                
+                <p id="wordingta" class="input">
                     <label for="inserwording">{'Wording'|@translate}</label><br />
                     <textarea {if $useED==1}placeholder="{'Use Extended Description tags...'|@translate}"{/if} style="margin-left:50px" rows="5" cols="50" class="description" name="inserwording" id="aip_add">{$addinfo_edit2.AIPDESC}</textarea>
@@ -120 +299 @@
                     <label for="inseractive">{'Hide'|@translate}</label>
                     <input id="aip_hide" type="checkbox" name="inseractive" {if {$addinfo_edit2.AIPACTIF}==1}checked{/if} value="1">
-                <p class="actionButtons">
+                </p>
+                                <div id="mppselect" class="input_fields_wrap">
+                                        <Span class="selectlabel">{'Option List'|@translate}</span><br>
+                                        <button class="add_field_button">{'Add Field'|@translate}</button>
+                                        <div><input type="text" id="mytext1" name="mytext[]"></div>
+                                </div>
+                                <div id="exifselect" class="exifselect">
+                                        <select name="selectexif" id="selectexif">
+                                                <option value="">-----</option>
+                                          {foreach from=$rm_exif item=rm}
+                                                {if isset($rm.RM_AFF) and $rm.RM_AFF!='1' and $rm.RM_AFF!=''}<optgroup label="{$rm.RM_AFF}"></optgroup>{/if}
+                                                <option value="{if isset ($rm.RM_SECTION) and ($rm.RM_SECTION)!='1'}{$rm.RM_SECTION}:{/if}{$rm.RM_KEY}">{if isset ($rm.RM_SECTION) and ($rm.RM_SECTION)!='1'}&nbsp;&nbsp;&nbsp;{/if}{$rm.RM_KEY}</option>
+                                          {/foreach}
+                                        </select>{if empty ($rm_exif)}<span style="margin: 0 0 0 20px">{'The reference photo doesn\'t have exif'|@translate}{/if}
+                                </div>
+                                <div id="iptcselect" class="iptcselect">
+                                        <select name="selectiptc" id="selectiptc">
+                                                <option value="">-----</option>
+                                            {foreach from=$rm_iptc item=rm}
+                                                  <option value="{$rm.RM_KEY}">{$rm.RM_KEY}</option>
+                                                {/foreach}
+                                        </select>{if empty ($rm_iptc)}<span style="margin: 0 0 0 20px">{'The reference photo doesn\'t have IPTC'|@translate}{/if}
+                                </div>
+                                <p class="actionButtons">
                     <input class="submit" name="submitaddAIP" type="submit" value="{'Submit'|@translate}" />
                     <a href="#" id="addinfoClose">{'Cancel'|@translate}</a>
@@ -145 +347 @@
                     <span id="ppshow{$infophoto.IDINFOPHO}" {if ($infophoto.AIPACTIVE==0)}style="display: none"{/if}class="graphicalCheckbox icon-check mouse ppshow" data-id="{$infophoto.IDINFOPHO}" data-link2="{$infophoto.U_SHOW}">{'Hide'|@translate}</span>
                     {if ($infophoto.AIPEDIT==1)}
-                                        | <span class="edit_libinfo mouse icon-pencil" data-id="{$infophoto.IDINFOPHO}" data-lib="{$infophoto.AIPWORDING2}" data-hide="{$infophoto.AIPACTIVE}"/>{'Edit'|@translate}</span>
+                                        | <span class="edit_libinfo mouse icon-pencil" data-id="{$infophoto.IDINFOPHO}" data-lib="{$infophoto.AIPWORDING2}" data-hide="{$infophoto.AIPACTIVE}" data-typ="{$infophoto.AIPTYP}" data-dataprop='{$infophoto.AIPDATAPROP}' />{'Edit'|@translate}</span>
                                         | <a href="{$infophoto.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><span class="icon-trash"></span>{'delete'|@translate}</a>
                     {/if}
@@ -155 +357 @@
         </fieldset>
     </form>
+                            {if $useED==1}
+                        <a href="{$ROOT_URL}admin/popuphelp.php?page=extended_desc" onclick="popuphelp(this.href); return false;" title="{'Use Extended Description tags...'|translate}" style="vertical-align: middle; border: 0; margin: 0.5em;"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/help.png" class="button" alt="{'Use Extended Description tags...'|translate}'"></a>
+                    {/if}
 {/if}
 {if isset ($gestionD)}
@@ -165 +370 @@
             <tr>
                 <td style="width: 100px;"><span style="font-weight: bold; text-align: right;" >{$infophoto.AIPWORDING}</span></td>
-                <td><input type="text" size="150" maxlength="250" {if $useED==1}placeholder="{'Use Extended Description tags...'|@translate}"{/if} name="data[{$infophoto.IDINFOPHO}]" value="{$infophoto.AIPDATA}" /></td>
-            </tr>  
+                {if $infophoto.AIPTYP==1}
+                                        <td><input data-typ="{$infophoto.AIPTYP}" type="text" size="150" maxlength="250" {if $useED==1}placeholder="{'Use Extended Description tags...'|@translate}"{/if} name="data[{$infophoto.IDINFOPHO}]" value="{$infophoto.AIPDATA}" /></td>
+                                {/if}
+                                {if $infophoto.AIPTYP==2}
+                                        <td><input type="text" class="dateSelect" id="dateSelect[{$infophoto.IDINFOPHO}]" name="datadate[{$infophoto.IDINFOPHO}]" style="width:120px;" value="{$infophoto.AIPDATA}"></td>
+                                {/if}
+                                {if $infophoto.AIPTYP==4}
+                                        <td>{html_options name="data[{$infophoto.IDINFOPHO}]" values=$infophoto.AIPSELECT output=$infophoto.AIPSELECTTRANS selected="{$infophoto.AIPDATA}"}</td>
+                                {/if}
+                                {if $infophoto.AIPTYP==5}
+                                        <td>{html_radios name="data[{$infophoto.IDINFOPHO}]" values=$infophoto.AIPSELECT output=$infophoto.AIPSELECTTRANS selected="{$infophoto.AIPDATA}" separator='<span style="margin: 0 0 0 10px"></span>'}</td>
+                                {/if}
+                        </tr>  
             {/foreach}
             <tr style="text-align: right;">
@@ -185 +401 @@
 </div>
 {/if}
+
+{if isset($mppconfig)}
+  <fieldset>
+        <div style="text-align:left">
+        <form method="post">
+          {if isset($mppconfig.ADDPHOAC)}
+                <span style="margin: 0 0 0 20px"><input class="submit" name="submitadddelpho" type="submit" value="{'Add field for automatic deletion\'s photos on a given date'|@translate}" />
+          {else}
+                <span style="margin: 0 0 0 20px"><input class="submit" name="submitremovedelpho" type="submit" value="{'Remove Field for automatic deletion\'s photos on a given date and all date save'|@translate}" />
+          {/if}
+          <br>
+          <br>
+          {if isset($mppconfig.MOVEDESC)}
+                <span style="margin: 0 0 0 20px"><input class="submit" name="submitmovedesc" type="submit" value="{'Move description in info table'|@translate}" />
+          {else}
+            <span style="margin: 0 0 0 20px"><input class="submit" name="submitdefaultdesc" type="submit" value="{'Return description in default location'|@translate}" />
+          {/if}
+          <br>
+        </div>
+        </form>
+        <form method="post">
+          <br>
+          <span style="margin: 0 0 0 20px">{'Max field for select or ratio option'|@translate}&nbsp;:<br>
+          <span style="margin: 0 0 0 20px"><input type="number" name="mppmaxfield" value="{$MPPMAXFIELD}" >
+          <br>
+          <br>
+          <br>
+          <span style="margin: 0 0 0 20px">{'The reference photo for exif and IPTC'|@translate}&nbsp;:<br>
+          <span style="margin: 0 0 0 20px"><input type="number" name="mppitidexif" value="{$MPPIDEXIF}" >
+          <br>
+          <p>
+        <input class="submit" type="submit" name="submitmppoption" value="{'Submit'|@translate}">
+      </p>
+        </form>
+  </fieldset>
+{/if}

extensions/manage_properties_photos/admin/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 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 file is part of Piwigo.                                          |
 // |                                                                       |
-// | 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.                                                                  |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
 // +-----------------------------------------------------------------------+
 

extensions/manage_properties_photos/include/function.aip.inc.php

@@ -2 +2 @@
 
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -24 +24 @@
 function tab_add_info_one_photo($id_img){
 $query = '
-    SELECT aip.id_prop_pho,aip.wording,aipd.data,aip.orderprop
+    SELECT aip.id_prop_pho,aip.wording,aipd.data,aip.orderprop,aip.Typ
     FROM ' . ADD_PROP_PHOTO_TABLE . ' AS aip
     LEFT JOIN ' . ADD_PROP_PHOTO_DATA_TABLE . ' AS aipd ON aip.id_prop_pho=aipd.id_prop_pho
@@ -51 +51 @@
 function tab_add_info_by_photo(){
 $query = '
-    SELECT id_prop_pho,wording
+    SELECT id_prop_pho,wording,Typ,dataprop
     FROM ' . ADD_PROP_PHOTO_TABLE . ' 
-    WHERE active = 0 
-    AND edit = 1 
+    WHERE edit = 1
+        AND typ != 3
+        AND typ != 6
     ORDER BY orderprop ASC
     ;';
@@ -64 +65 @@
 function tab_add_info_by_photo_show(){
 $query = '
-    SELECT id_prop_pho,wording,orderprop
+    SELECT id_prop_pho,wording,orderprop,Typ,dataprop
     FROM ' . ADD_PROP_PHOTO_TABLE . ' 
     WHERE active = 0 
@@ -88 +89 @@
 }
 
+function data_info_photosdate($id_img=null,$id_prop_pho=NULL){
+$query = '
+    SELECT datadate
+    FROM ' . ADD_PROP_PHOTO_DATADATE_TABLE;
+    $wa='WHERE';
+    if($id_img!=null){
+        $query .=' '.$wa.' id_img='.$id_img;$wa='AND';
+    }
+    if($id_prop_pho!=null){
+        $query .=' '.$wa.' id_prop_pho='.$id_prop_pho;$wa='AND';
+    }
+$query .= ';';
+return pwg_query($query);
+}
+
 /*Admin*/
 function tab_info_photos($id_prop_pho=NULL){
 $query = '
-    SELECT id_prop_pho,wording,orderprop,active,edit
+    SELECT id_prop_pho,wording,orderprop,active,edit,Typ,dataprop
     FROM ' . ADD_PROP_PHOTO_TABLE;
     if($id_prop_pho!=null){

extensions/manage_properties_photos/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 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 file is part of Piwigo.                                          |
 // |                                                                       |
-// | 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.                                                                  |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
 // +-----------------------------------------------------------------------+
 

extensions/manage_properties_photos/initadmin.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -52 +52 @@
 function MPP_loc_end_element_set_global(){
   global $template;
+  
+  $template->assign(array(
+  'ADD_PROP_PHOTO_PATH'=> get_root_url() . ADD_PROP_PHOTO_PATH,
+  )); 
+  
   $q = 'SELECT 1 FROM ' . ADD_PROP_PHOTO_TABLE . ' WHERE edit=1';
   $test = pwg_query($q);
@@ -65 +70 @@
         $template->assign('useED',0);
       }
+        while ($info_select = pwg_db_fetch_assoc($propertieslist2)){
+                $items = array(
+                        'IDINFOPHO' => $info_select['id_prop_pho'],
+                        'AIPWORDING' => trigger_change('AP_render_content',$info_select['wording']),
+                        'AIPTYP' => $info_select['Typ'],
+                );
+                if($info_select['Typ']==4||$info_select['Typ']==5){
+                        $items['AIPDATAPROP'] =  json_encode(unserialize($info_select['dataprop']));
+                }       
+                if($info_select['wording']=="**delpho**"){
+                        $items['AIPWORDING'] =l10n('Delete photo');
+                }
+                $template->append('info_select', $items);
+        }
+         /* $propertieslist[]="------";
         while ($row = pwg_db_fetch_assoc($propertieslist2)){
-          $propertieslist[$row['id_prop_pho']] = trigger_change('AP_render_content', $row['wording']);
-        }
+                $propertieslist[$row['Typ']][$row['id_prop_pho']]=trigger_change('AP_render_content', $row['wording']);
+        }*/
+        
     $template->set_filename('MMPP', realpath(ADD_PROP_PHOTO_PATH.'mmp.tpl'));
     $template->assign('propertieslist', $propertieslist);
@@ -82 +103 @@
         global $page,$template,$prefixeTable;
     $id_prop_pho= $_POST['IDMPP'];
-        $data= $_POST['dataglob'];      
+        $Typ=$_POST['invisibleTyp'];
+        if($Typ==2){
+                $data= $_POST['datadate'];
+        }else if($Typ==4){
+                $data= $_POST['dataselect'];
+        }else if($Typ==5){
+                $data= $_POST['radioselect'];
+        }else{
+                $data= $_POST['dataglob'];
+        }
+        
+  if($Typ==2){
+        if (!empty($_POST['check_MPP'])){
+          foreach ($collection as $image_id){
+                $query = 'DELETE FROM ' . $prefixeTable . 'add_properties_photos_datadate WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
+                pwg_query($query);
+      }
+    }else{
+      foreach ($collection as $image_id){
+            $q = 'SELECT 1 FROM ' . ADD_PROP_PHOTO_DATADATE_TABLE . ' WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
+        $test = pwg_query($q);
+        $row = pwg_db_fetch_assoc($test);
+        if (!empty($row)) {
+                  if ($data != '') {
+                        $query = 'UPDATE ' . $prefixeTable . 'add_properties_photos_datadate SET datadate="' . $data . '" WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
+                        pwg_query($query);
+                  }else{
+                        $query = 'DELETE FROM ' . $prefixeTable . 'add_properties_photos_datadate WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
+                        pwg_query($query);
+                  }
+        }else if ($data != ''){
+            $query = 'INSERT ' . $prefixeTable . 'add_properties_photos_datadate(id_img,id_prop_pho,datadate) VALUES (' . $image_id . ',' . $id_prop_pho . ',"' . $data . '");';
+            pwg_query($query);
+        }
+      }
+    }
+  }else{
         if (!empty($_POST['check_MPP'])){
           foreach ($collection as $image_id){
@@ -90 +147 @@
     }else{
       foreach ($collection as $image_id){
-            $q = 'SELECT 1 FROM ' . ADD_PROP_PHOTO_DATA_TABLE . ' WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
+            $q = 'SELECT id_img FROM ' . ADD_PROP_PHOTO_DATA_TABLE . ' WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
         $test = pwg_query($q);
         $row = pwg_db_fetch_assoc($test);
-        if (count($row) > 0) {
+        if (!empty($row)) {
                   if ($data != '') {
                         $query = 'UPDATE ' . $prefixeTable . 'add_properties_photos_data SET data="' . $data . '" WHERE id_img=' . $image_id . ' AND id_prop_pho=' . $id_prop_pho;
@@ -107 +164 @@
       }
     }
+  }
   }
 }

extensions/manage_properties_photos/initpicture.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -30 +30 @@
 function add_info_photo_preT($content, &$smarty) {
 
-    global $conf;
-  
-   $search = '/(<dl id="standard" class="imageInfoTable">).*({if isset\(\$metadata\)})/is';
-   
-   $repla='<dl id="standard" class="imageInfoTable">{strip}
+    global $conf, $user;
+
+   $repla1='<dl id="standard" class="imageInfoTable">{strip}';
+   $repla='
 {foreach from=$add_info_photos item=addinfophotos}
     {if $addinfophotos.AIPID == 1 and isset($INFO_AUTHOR)}
-        <div id="Author" class="imageInfo">
+    <div id="Author" class="imageInfo">
                 <dt>{\'Author\'|@translate}</dt>
                 <dd>{$INFO_AUTHOR}</dd>
         </div>
     {else if $addinfophotos.AIPID == 2 and isset($INFO_CREATION_DATE)}
-        <div id="datecreate" class="imageInfo">
+    <div id="datecreate" class="imageInfo">
                 <dt>{\'Created on\'|@translate}</dt>
                 <dd>{$INFO_CREATION_DATE}</dd>
@@ -193 +192 @@
     {/if}
 {/foreach}
-{/strip}
+';
+        $repla2='{/strip}
 </dl>
+{if isset($metadata)}';
+
+        $repladarkroomcards='
+  <div id="infopanel-left" class="col-lg-6 col-12">
+      <!-- Picture infos -->
+      <div id="card-informations" class="card mb-2">
+        <div class="card-body">
+          <h5 class="card-title">{\'Information\'|@translate}</h5>
+          <div id="info-content" class="d-flex flex-column">
+  '.$repla.'
+      </div></div></div></div>
+  {if isset($metadata) || (isset($comment_add) || $COMMENT_COUNT > 0)}
+    <div id="infopanel-right" class="col-lg-6 col-12">
+    <!-- metadata -->
 {if isset($metadata)}
-';
-     
-    return preg_replace($search, $repla , $content);
-
+{if isset($loaded_plugins[\'exif_view\'])}
+{assign var="exif_make" value="{\'exif_field_Make\'|@translate}"}
+{assign var="exif_model" value="{\'exif_field_Model\'|@translate}"}
+{assign var="exif_lens" value="{\'exif_field_UndefinedTag:0xA434\'|@translate}"}
+{assign var="exif_fnumber" value="{\'exif_field_FNumber\'|@translate}"}
+{assign var="exif_iso" value="{\'exif_field_ISOSpeedRatings\'|@translate}"}
+{assign var="exif_focal_length" value="{\'exif_field_FocalLength\'|@translate}"}
+{assign var="exif_flash" value="{\'exif_field_Flash\'|@translate}"}
+{assign var="exif_exposure_time" value="{\'exif_field_ExposureTime\'|@translate}"}
+{assign var="exif_exposure_bias" value="{\'exif_field_ExposureBiasValue\'|@translate}"}
+{else}
+{assign var="exif_make" value="Make"}
+{assign var="exif_model" value="Model"}
+{assign var="exif_lens" value="UndefinedTag:0xA434"}
+{assign var="exif_fnumber" value="FNumber"}
+{assign var="exif_iso" value="ISOSpeedRatings"}
+{assign var="exif_focal_length" value="FocalLength"}
+{assign var="exif_flash" value="Flash"}
+{assign var="exif_exposure_time" value="ExposureTime"}
+{assign var="exif_exposure_bias" value="ExposureBiasValue"}
+{/if}
+
+      <div id="card-metadata" class="card mb-2">
+        <div class="card-body">
+          <h5 class="card-title">{\'EXIF Metadata\'|@translate}</h5>
+          <div id="metadata">
+            {if is_array($metadata.0.lines) && (array_key_exists("{$exif_make}", $metadata.0.lines) || array_key_exists("{$exif_model}", $metadata.0.lines))}
+            <div class="row" style="line-height: 40px">
+              <div class="col-12">
+                <span class="camera-compact fa-3x mr-3" title="{$exif_make} &amp; {$exif_model}"></span>
+                {if is_array($metadata.0.lines) && (array_key_exists("{$exif_make}", $metadata.0.lines))}{$metadata.0.lines[{$exif_make}]}{/if}
+                {if is_array($metadata.0.lines) && (array_key_exists("{$exif_model}", $metadata.0.lines))}{$metadata.0.lines[{$exif_model}]}{/if}
+              </div>
+            </div>
+            {/if}
+            {if is_array($metadata.0.lines) && (array_key_exists("{$exif_lens}", $metadata.0.lines))}
+            <div class="row" style="line-height: 40px">
+              <div class="col-12">
+                <span class="camera-lens-h fa-3x mr-3" title="{$exif_lens}"></span>
+                    {$metadata.0.lines[{$exif_lens}]}
+              </div>
+            </div>
+            {/if}
+            <div class="row">
+              <div class="col-12{if $theme_config->fluid_width} col-xl-10{/if}">
+                <div class="row">
+                  {if is_array($metadata.0.lines) && (array_key_exists("{$exif_fnumber}", $metadata.0.lines))}
+                  <div class="col-6 col-sm-4">
+                    <span class="camera-aperture fa-2x pr-2" title="{$exif_fnumber}"></span> f/{$metadata.0.lines[{$exif_fnumber}]}
+                  </div>
+                  {/if}
+                  {if is_array($metadata.0.lines) && (array_key_exists("{$exif_focal_length}", $metadata.0.lines))}
+                  <div class="col-6 col-sm-4">
+                    <span class="camera-focal-length fa-2x pr-2" title="{$exif_focal_length}"></span> {$metadata.0.lines[{$exif_focal_length}]}
+                  </div>
+                  {/if}
+                  {if is_array($metadata.0.lines) && (array_key_exists("{$exif_exposure_time}", $metadata.0.lines))}
+                  <div class="col-6 col-sm-4">
+                    <span class="camera-shutter-speed fa-2x pr-2" title="{$exif_exposure_time}"></span> {$metadata.0.lines[{$exif_exposure_time}]}
+                  </div>
+                  {/if}
+                  {if is_array($metadata.0.lines) && (array_key_exists("{$exif_iso}", $metadata.0.lines))}
+                  <div class="col-6 col-sm-4">
+                    <span class="camera-iso fa-2x pr-2" title="{$exif_iso}"></span> {$metadata.0.lines[{$exif_iso}]}
+                  </div>
+                  {/if}
+                  {if is_array($metadata.0.lines) && (array_key_exists("{$exif_exposure_bias}", $metadata.0.lines))}
+                  <div class="col-6 col-sm-4">
+                    <span class="camera-exposure fa-2x pr-2" title="{$exif_exposure_bias}"></span> {$metadata.0.lines[{$exif_exposure_bias}]}
+                  </div>
+                  {/if}
+                  {if is_array($metadata.0.lines) && (array_key_exists("{$exif_flash}", $metadata.0.lines))}
+                  <div class="col-6 col-sm-4">
+                    <span class="camera-flash fa-2x pr-2 float-left h-100" title="{$exif_flash}"></span><div> {$metadata.0.lines[{$exif_flash}]}</div>
+                  </div>
+                  {/if}
+                </div>
+              </div>
+            </div>
+          </div>
+          <button id="show_exif_data" class="btn btn-primary btn-raised mt-1" style="text-transform: none;"><i class="fas fa-info mr-1"></i> {\'Show EXIF data\'|@translate}</button>
+{footer_script require=\'jquery\'}
+$(\'#show_exif_data\').on(\'click\', function() {
+  if ($(\'#full_exif_data\').hasClass(\'d-none\')) {
+    $(\'#full_exif_data\').addClass(\'d-flex\').removeClass(\'d-none\');
+    $(\'#show_exif_data\').html(\'<i class="fas fa-info mr-1"></i> {"Hide EXIF data"|@translate}\');
+  } else {
+    $(\'#full_exif_data\').addClass(\'d-none\').removeClass(\'d-flex\');
+    $(\'#show_exif_data\').html(\'<i class="fas fa-info mr-1"></i> {"Show EXIF data"|@translate}\');
+  }
+});
+{/footer_script}
+          <div id="full_exif_data" class="d-none flex-column mt-2">
+{foreach from=$metadata item=meta}
+{foreach from=$meta.lines item=value key=label}
+            <div>
+              <dl class="row mb-0">
+                <dt class="col-sm-6">{$label}</dt>
+                <dd class="col-sm-6">{$value}</td>
+                  </tr>
+              </dl>
+            </div>
+{/foreach}
+{/foreach}
+          </div>
+        </div>
+      </div>
+{/if}
+      <div id="card-comments" class="ml-2">
+        {include file=\'picture_info_comments.tpl\'}
+      </div>
+    </div>
+{/if}
+  ';
+  
+ $repladarkroomtabs='
+     <div id="infopanel" class="col-lg-8 col-md-10 col-12 mx-auto">
+      <!-- Nav tabs -->
+      <ul class="nav nav-tabs nav-justified flex-column flex-sm-row" role="tablist">
+{if $theme_config->picture_info == \'tabs\' || (get_device() != \'desktop\' && $theme_config->picture_info != \'disabled\')}
+        <li class="nav-item"><a class="flex-sm-fill text-sm-center nav-link active" href="#tab_info" aria-controls="tab_info" role="tab" data-toggle="tab">{\'Information\'|@translate}</a></li>
+{if isset($metadata)}
+        <li class="nav-item"><a class="flex-sm-fill text-sm-center nav-link" href="#tab_metadata" aria-controls="tab_metadata" role="tab" data-toggle="tab">{\'EXIF Metadata\'|@translate}</a></li>
+{/if}
+{/if}
+{if isset($comment_add) || $COMMENT_COUNT > 0}
+        <li class="nav-item{if $theme_config->picture_info == \'disabled\' || ($theme_config->picture_info != \'tabs\' && get_device() == \'desktop\')} active{/if}"><a class="flex-sm-fill text-sm-center nav-link" href="#tab_comments" aria-controls="tab_comments" role="tab" data-toggle="tab">{\'Comments\'|@translate} <span class="badge badge-secondary">{$COMMENT_COUNT}</span></a></li>
+{/if}
+      </ul>
+
+      <!-- Tab panes -->
+      <div class="tab-content d-flex justify-content-center">
+{if $theme_config->picture_info === \'tabs\' || (get_device() != \'desktop\' && $theme_config->picture_info != \'disabled\')}
+        <div role="tabpanel" class="tab-pane active" id="tab_info">
+          <div id="info-content" class="info">
+            <div class="table-responsive">
+              <table class="table table-sm">
+                <colgroup>
+                  <col class="w-50">
+                  <col class="w-50">
+                </colgroup>
+                <tbody>
+ <!--mpp -->
+ {foreach from=$add_info_photos item=addinfophotos}
+    {if $addinfophotos.AIPID == 1 and isset($INFO_AUTHOR)}
+    <div id="Author" class="imageInfo">
+                <tr>
+            <th scope="row">{\'Author\'|@translate}</th>
+                        <td>{$INFO_AUTHOR}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 2 and isset($INFO_CREATION_DATE)}
+    <div id="datecreate" class="imageInfo">
+                <tr>
+            <th scope="row">{\'Created on\'|@translate}</th>
+                        <td>{$INFO_CREATION_DATE}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 3 and isset($INFO_POSTED_DATE)}
+        <div id="datepost" class="imageInfo">
+                <tr>
+            <th scope="row">{\'Posted on\'|@translate}</th>
+                        <td>{$INFO_POSTED_DATE}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 4 and isset($INFO_DIMENSIONS)}
+        <div id="Dimensions" class="imageInfo">
+                <tr>
+                        <th scope="row">{\'Dimensions\'|@translate}</th>
+                        <td>{$INFO_DIMENSIONS}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 5}
+        <div id="File" class="imageInfo">
+                <tr>
+                        <th scope="row">{\'File\'|@translate}</th>
+                        <td>{$INFO_FILE}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 6 and isset($INFO_FILESIZE)}
+        <div id="Filesize" class="imageInfo">
+                <tr>
+            <th scope="row">{\'Filesize\'|@translate}</th>
+                        <td>{$INFO_FILESIZE}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 7 and isset($related_tags)}
+        <div id="Tags" class="imageInfo">
+        <tr>
+                        <th scope="row">{\'Tags\'|@translate}</th>
+                        <td>
+                {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach}
+                        </td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 8 and isset($related_categories)}
+        <div id="Categories" class="imageInfo">
+        <tr>
+            <th scope="row">{\'Albums\'|@translate}</th>
+            <td>
+                <ul>
+                    {foreach from=$related_categories item=cat}
+                        <li>{$cat}</li>
+                    {/foreach}
+                </ul>
+            </td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 9}
+        <div id="Visits" class="imageInfo">
+                <tr>
+            <th scope="row">{\'Visits\'|@translate}</th>
+                        <td>{$INFO_VISITS}</td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPID == 10 and isset($rate_summary)}
+        <div id="Average" class="imageInfo">
+                <tr>
+            <th scope="row">{\'Rating score\'|@translate}</th>
+                        <td>
+                {if $rate_summary.count}
+                        <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$rate_summary.count|@translate_dec:\'%d rate\':\'%d rates\'})</span>
+                {else}
+                        <span id="ratingScore">{\'no rate\'|@translate}</span> <span id="ratingCount"></span>
+                {/if}
+                        </td>
+        </tr>
+        </div>
+        {if isset($rating)}
+        <div id="rating" class="imageInfo">
+                <tr>
+                        <th scope="row">
+                        <span id="updateRate">{if isset($rating.USER_RATE)}{\'Update your rating\'|@translate}{else}{\'Rate this photo\'|@translate}{/if}</span>
+                        </th>
+                        <td>
+                        <form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
+                        <div>
+                        {foreach from=$rating.marks item=mark name=rate_loop}
+                        {if isset($rating.USER_RATE) && $mark==$rating.USER_RATE}
+                                <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
+                        {else}
+                                <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
+                        {/if}
+                        {/foreach}
+                        {strip}{combine_script id=\'core.scripts\' load=\'async\' path=\'themes/default/js/scripts.js\'}
+                        {combine_script id=\'rating\' load=\'async\' require=\'core.scripts\' path=\'themes/default/js/rating.js\'}
+                        {footer_script}
+                                var _pwgRatingAutoQueue = _pwgRatingAutoQueue||[];
+                                _pwgRatingAutoQueue.push( {ldelim}rootUrl: \'{$ROOT_URL}\', image_id: {$current.id},
+                                        onSuccess : function(rating) {ldelim}
+                                                var e = document.getElementById("updateRate");
+                                                if (e) e.innerHTML = "{\'Update your rating\'|@translate|@escape:\'javascript\'}";
+                                                e = document.getElementById("ratingScore");
+                                                if (e) e.innerHTML = rating.score;
+                                                e = document.getElementById("ratingCount");
+                                                if (e) {ldelim}
+                                                        if (rating.count == 1) {ldelim}
+                                                                e.innerHTML = "({\'%d rate\'|@translate|@escape:\'javascript\'})".replace( "%d", rating.count);
+                                                        } else {ldelim}
+                                                                e.innerHTML = "({\'%d rates\'|@translate|@escape:\'javascript\'})".replace( "%d", rating.count);
+              }
+                                                {rdelim}
+                                        {rdelim}{rdelim} );
+                        {/footer_script}
+                        {/strip}
+                        </div>
+                        </form>
+                        </td>
+        </tr>
+        </div>
+        {/if}
+    {else if $addinfophotos.AIPID == 11 and $display_info.privacy_level and isset($available_permission_levels)}
+        <div id="Privacy" class="imageInfo">
+                <tr>
+                        <th scope="row">{\'Who can see this photo?\'|@translate}</th>
+                        <td>
+                        <div>
+                                <a id="privacyLevelLink" href>{$available_permission_levels[$current.level]}</a>
+                        </div>
+{combine_script id=\'core.scripts\' load=\'async\' path=\'themes/default/js/scripts.js\'}
+{footer_script require=\'jquery\'}{strip}
+function setPrivacyLevel(id, level){
+(new PwgWS(\'{$ROOT_URL}\')).callService(
+        "pwg.images.setPrivacyLevel", { image_id:id, level:level},
+        {
+                method: "POST",
+                onFailure: function(num, text) { alert(num + " " + text); },
+                onSuccess: function(result) {
+                          jQuery(\'#privacyLevelBox .switchCheck\').css(\'visibility\',\'hidden\');
+                                jQuery(\'#switchLevel\'+level).prev(\'.switchCheck\').css(\'visibility\',\'visible\');
+                                jQuery(\'#privacyLevelLink\').text(jQuery(\'#switchLevel\'+level).text());
+                }
+        }
+        );
 }
+(SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
+{/strip}{/footer_script}
+                        <div id="privacyLevelBox" class="switchBox" style="display:none">
+                                {foreach from=$available_permission_levels item=label key=level}
+                                        <span class="switchCheck"{if $level != $current.level} style="visibility:hidden"{/if}>&#x2714; </span>
+                                        <a id="switchLevel{$level}" href="javascript:setPrivacyLevel({$current.id},{$level})">{$label}</a><br>
+                                {/foreach}
+                        </div>
+                        </td>
+        </tr>
+        </div>
+    {else if $addinfophotos.AIPWORDING == \'Description\' and isset($COMMENT_IMG)}
+        <div id="Description" class="imageInfo">
+        <tr>
+                        <th scope="row">{\'Description\'|@translate}</th>
+            <td>
+                {$COMMENT_IMG}
+            </td>
+        </tr>
+        </div>
+        {footer_script}
+            jQuery(document).ready(function(){
+              jQuery(".imageComment").hide();
+            });
+        {/footer_script}
+    {else if $addinfophotos.AIPDATA}
+        <div id="add_info" class="imageInfo">
+          <tr>
+            <th scope="row label">{$addinfophotos.AIPWORDING}</th>
+          <td class="value">{$addinfophotos.AIPDATA}</td>
+                  </tr>
+        </div>
+    {/if}
+{/foreach}
+ <!--and mpp -->
+                 </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+         <!-- metadata -->
+{if isset($metadata)}
+        <div role="tabpanel" class="tab-pane" id="tab_metadata">
+          <div id="metadata" class="info">
+            <div class="table-responsive">
+              <table class="table table-sm">
+                <colgroup>
+                  <col class="w-50">
+                  <col class="w-50">
+                </colgroup>
+                <tbody>
+{foreach from=$metadata item=meta}
+{foreach from=$meta.lines item=value key=label}
+                  <tr>
+                    <th scope="row">{$label}</th>
+                    <td>{$value}</td>
+                  </tr>
+{/foreach}
+{/foreach}
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+{/if}
+{/if}
+
+        <!-- comments -->
+{if isset($comment_add) || $COMMENT_COUNT > 0}
+        <div role="tabpanel" class="tab-pane" id="tab_comments">
+          {include file=\'picture_info_comments.tpl\'}
+        </div>
+{/if}
+      </div>
+    </div>
+
+ ';
+ 
+ $replasmart='
+ <ul data-role="listview" data-inset="true" id="PictureInfo">
+{strip}
+ <!--mpp -->
+{foreach from=$add_info_photos item=addinfophotos}
+    {if $addinfophotos.AIPID == 1 and isset($INFO_AUTHOR)}
+    <li id="Author" class="imageInfo">
+                <dt>{\'Author\'|@translate}</dt>
+                <dd>{$INFO_AUTHOR}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 2 and isset($INFO_CREATION_DATE)}
+    <li id="datecreate" class="imageInfo">
+                <dt>{\'Created on\'|@translate}</dt>
+                <dd>{$INFO_CREATION_DATE}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 3 and isset($INFO_POSTED_DATE)}
+        <li id="datepost" class="imageInfo">
+                <dt>{\'Posted on\'|@translate}</dt>
+                <dd>{$INFO_POSTED_DATE}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 4 and isset($INFO_DIMENSIONS)}
+        <li id="Dimensions" class="imageInfo">
+                <dt>{\'Dimensions\'|@translate}</dt>
+                <dd>{$INFO_DIMENSIONS}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 5}
+        <li id="File" class="imageInfo">
+                <dt>{\'File\'|@translate}</dt>
+                <dd>{$INFO_FILE}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 6 and isset($INFO_FILESIZE)}
+        <li id="Filesize" class="imageInfo">
+                <dt>{\'Filesize\'|@translate}</dt>
+                <dd>{$INFO_FILESIZE}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 7 and isset($related_tags)}
+        <li id="Tags" class="imageInfo">
+        <dt>{\'Tags\'|@translate}</dt>
+                <dd>
+                {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}<a href="{$tag.URL}">{$tag.name}</a>{/foreach}
+                </dd>
+        </li>
+    {else if $addinfophotos.AIPID == 8 and isset($related_categories)}
+        <li id="Categories" class="imageInfo">
+            <dt>{\'Albums\'|@translate}</dt>
+            <dd>
+                <ul>
+                    {foreach from=$related_categories item=cat}
+                        <li>{$cat}</li>
+                    {/foreach}
+                </ul>
+            </dd>
+        </li>
+    {else if $addinfophotos.AIPID == 9}
+        <li id="Visits" class="imageInfo">
+                <dt>{\'Visits\'|@translate}</dt>
+                <dd>{$INFO_VISITS}</dd>
+        </li>
+    {else if $addinfophotos.AIPID == 10 and isset($rate_summary)}
+        <li id="Average" class="imageInfo">
+                <dt>{\'Rating score\'|@translate}</dt>
+                <dd>
+                {if $rate_summary.count}
+                        <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({$rate_summary.count|@translate_dec:\'%d rate\':\'%d rates\'})</span>
+                {else}
+                        <span id="ratingScore">{\'no rate\'|@translate}</span> <span id="ratingCount"></span>
+                {/if}
+                </dd>
+        </li>
+        {if isset($rating)}
+        <li id="rating" class="imageInfo">
+                <dt>
+                        <span id="updateRate">{if isset($rating.USER_RATE)}{\'Update your rating\'|@translate}{else}{\'Rate this photo\'|@translate}{/if}</span>
+                </dt>
+                <dd>
+                        <form action="{$rating.F_ACTION}" method="post" id="rateForm" style="margin:0;">
+                        <div>
+                        {foreach from=$rating.marks item=mark name=rate_loop}
+                        {if isset($rating.USER_RATE) && $mark==$rating.USER_RATE}
+                                <input type="button" name="rate" value="{$mark}" class="rateButtonSelected" title="{$mark}">
+                        {else}
+                                <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
+                        {/if}
+                        {/foreach}
+                        {strip}{combine_script id=\'core.scripts\' load=\'async\' path=\'themes/default/js/scripts.js\'}
+                        {combine_script id=\'rating\' load=\'async\' require=\'core.scripts\' path=\'themes/default/js/rating.js\'}
+                        {footer_script}
+                                var _pwgRatingAutoQueue = _pwgRatingAutoQueue||[];
+                                _pwgRatingAutoQueue.push( {ldelim}rootUrl: \'{$ROOT_URL}\', image_id: {$current.id},
+                                        onSuccess : function(rating) {ldelim}
+                                                var e = document.getElementById("updateRate");
+                                                if (e) e.innerHTML = "{\'Update your rating\'|@translate|@escape:\'javascript\'}";
+                                                e = document.getElementById("ratingScore");
+                                                if (e) e.innerHTML = rating.score;
+                                                e = document.getElementById("ratingCount");
+                                                if (e) {ldelim}
+                                                        if (rating.count == 1) {ldelim}
+                                                                e.innerHTML = "({\'%d rate\'|@translate|@escape:\'javascript\'})".replace( "%d", rating.count);
+                                                        } else {ldelim}
+                                                                e.innerHTML = "({\'%d rates\'|@translate|@escape:\'javascript\'})".replace( "%d", rating.count);
+              }
+                                                {rdelim}
+                                        {rdelim}{rdelim} );
+                        {/footer_script}
+                        {/strip}
+                        </div>
+                        </form>
+                </dd>
+        </li>
+        {/if}
+    {else if $addinfophotos.AIPID == 11 and $display_info.privacy_level and isset($available_permission_levels)}
+        <li id="Privacy" class="imageInfo">
+                <dt>{\'Who can see this photo?\'|@translate}</dt>
+                <dd>
+                        <div>
+                                <a id="privacyLevelLink" href>{$available_permission_levels[$current.level]}</a>
+                        </div>
+{combine_script id=\'core.scripts\' load=\'async\' path=\'themes/default/js/scripts.js\'}
+{footer_script require=\'jquery\'}{strip}
+function setPrivacyLevel(id, level){
+(new PwgWS(\'{$ROOT_URL}\')).callService(
+        "pwg.images.setPrivacyLevel", { image_id:id, level:level},
+        {
+                method: "POST",
+                onFailure: function(num, text) { alert(num + " " + text); },
+                onSuccess: function(result) {
+                          jQuery(\'#privacyLevelBox .switchCheck\').css(\'visibility\',\'hidden\');
+                                jQuery(\'#switchLevel\'+level).prev(\'.switchCheck\').css(\'visibility\',\'visible\');
+                                jQuery(\'#privacyLevelLink\').text(jQuery(\'#switchLevel\'+level).text());
+                }
+        }
+        );
+}
+(SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
+{/strip}{/footer_script}
+                        <div id="privacyLevelBox" class="switchBox" style="display:none">
+                                {foreach from=$available_permission_levels item=label key=level}
+                                        <span class="switchCheck"{if $level != $current.level} style="visibility:hidden"{/if}>&#x2714; </span>
+                                        <a id="switchLevel{$level}" href="javascript:setPrivacyLevel({$current.id},{$level})">{$label}</a><br>
+                                {/foreach}
+                        </div>
+                </dd>
+        </li>
+    {else if $addinfophotos.AIPWORDING == \'Description\' and isset($COMMENT_IMG)}
+        <li id="Description" class="imageInfo">
+            <dt>{\'Description\'|@translate}</dt>
+            <dd>
+                {$COMMENT_IMG}
+            </dd>
+        </li>
+        {footer_script}
+            jQuery(document).ready(function(){
+              jQuery(".imageComment").hide();
+            });
+        {/footer_script}
+    {else if $addinfophotos.AIPDATA}
+    <li id="add_info" class="imageInfo">
+        <dt class="label">{$addinfophotos.AIPWORDING}</dt>
+        <dd class="value">{$addinfophotos.AIPDATA}</dd>
+    </li>
+    {/if}
+{/foreach}
+ <!--and mpp -->
+{if isset($metadata)}
+ ';
+
+$replastandard=$repla1.$repla.$repla2;
+
+   $repladarkroom='<div id="theImageInfos" class="row justify-content-center">
+{if $theme_config->picture_info == \'cards\'}'
+        .$repladarkroomcards.'    
+{elseif $theme_config->picture_info == \'tabs\'}'
+        .$repladarkroomtabs.'   
+{elseif $theme_config->picture_info == \'sidebar\' || $theme_config->picture_info == \'disabled\'}
+    <div class="col-lg-8 col-md-10 col-12 mx-auto">
+      {include file=\'picture_info_comments.tpl\'} 
+    </div>
+{/if}
+  </div>
+
+{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
+ ';
+  if ($user['theme'] == 'bootstrap_darkroom'){
+          $themeconfig = new \BootstrapDarkroom\Config();
+                if($themeconfig->picture_info=='sidebar'){
+                        $search = '/(<dl id="standard" class="imageInfoTable">).*({if isset\(\$metadata\)})/is';
+                        return preg_replace($search, $replastandard , $content);
+                }else{
+                        $search = '/(<div id="theImageInfos" class="row justify-content-center">).*({if \!empty\(\$PLUGIN_PICTURE_AFTER\)}{\$PLUGIN_PICTURE_AFTER}{\/if})/is';  
+                        return preg_replace($search, $repladarkroom , $content);
+                }
+        }else if ($user['theme'] == 'smartpocket'){
+          $search = '/(<ul data-role="listview" data-inset="true" id="PictureInfo">).*({if isset\(\$metadata\)})/is';
+           return preg_replace($search, $replasmart , $content);
+        }else{
+          $search = '/(<dl id="standard" class="imageInfoTable">).*({if isset\(\$metadata\)})/is';
+          return preg_replace($search, $replastandard , $content);
+  }
+}
 
 add_event_handler('loc_begin_picture', 'add_InfoT');
 
 function add_InfoT() {
-    global $conf, $page, $template;
+    global $conf, $page, $template, $lang, $pwg_loaded_plugins;
 
     if (!empty($page['image_id'])) {
-        $PAED = pwg_db_fetch_assoc(pwg_query("SELECT state FROM " . PLUGINS_TABLE . " WHERE id = 'ExtendedDescription';"));
-        if ($PAED['state'] == 'active')
-            add_event_handler('AP_render_content', 'get_user_language_desc');
-
+          if (isset($pwg_loaded_plugins['ExtendedDescription'])){add_event_handler('AP_render_content', 'get_user_language_desc');}
+                
         $tab_add_info_one_photo = tab_add_info_by_photo_show();
-
+                
+                $query = 'select path FROM ' . IMAGES_TABLE . ' WHERE id = \''.$page['image_id'].'\';';
+                $result = pwg_query($query);
+                $row = pwg_db_fetch_assoc($result);
+                $filename=$row['path'];
+                $exif = exif_read_data($filename);
+                $imginfo = array();
+                getimagesize($filename, $imginfo);
+                if (isset ($imginfo['APP13'])){$iptc = iptcparse($imginfo['APP13']);}
         if (pwg_db_num_rows($tab_add_info_one_photo)) {
             while ($info_photos = pwg_db_fetch_assoc($tab_add_info_one_photo)) {
-
-                $d = data_info_photos($page['image_id'], $info_photos['id_prop_pho']);
-                $row = pwg_db_fetch_assoc($d);
-
+                                if($info_photos['Typ']==2){
+                                        $d = data_info_photosdate($page['image_id'], $info_photos['id_prop_pho']);
+                }else{
+                                        $d = data_info_photos($page['image_id'], $info_photos['id_prop_pho']);
+                                }
+                                $row = pwg_db_fetch_assoc($d);
                 $items = array(
                     'AIPID' => $info_photos['id_prop_pho'],
                     'AIPORDER' => $info_photos['orderprop'],
                     'AIPWORDING' => trigger_change('AP_render_content', $info_photos['wording']),
-                    'AIPDATA' => trigger_change('AP_render_content', $row['data']),
                 );
+                                if($info_photos['Typ']==2){
+                                        $items['AIPDATA']=$row['datadate'];
+                                        if($info_photos['wording']=="**delpho**"){
+                                                $items['AIPWORDING'] =l10n('Delete photo');
+                                        }
+                }else if($info_photos['Typ']==3){
+                                  if(strpos($info_photos['dataprop'],':')!==false){
+                                    $exiftab = explode(':', $info_photos['dataprop']);
+                                        if (isset($exif[$exiftab[0]][$exiftab[1]])){
+                                                if (isset($pwg_loaded_plugins['exif_view'])){
+                                                        $items['AIPDATA']=exif_key_translation($exif[$exiftab[0]][$exiftab[1]], $exif[$exiftab[0]][$exiftab[1]]);
+                                                }else{
+                                                        $items['AIPDATA']= $exif[$exiftab[0]][$exiftab[1]];
+                                                }
+                                                if ($info_photos['wording']!=$info_photos['dataprop']){
+                                                }else if (isset($lang['exif_field_'.$exiftab[1]])){
+                                                        $items['AIPWORDING']= $lang['exif_field_'.$exiftab[1]];
+                                                }else{
+                                                        $items['AIPWORDING']= $exiftab[1];
+                                                }
+                                        }
+                                  }else{
+                                        if (isset($exif[$info_photos['dataprop']])){
+                                                if (isset($pwg_loaded_plugins['exif_view'])){
+                                                        $items['AIPDATA']=exif_key_translation($info_photos['dataprop'], $exif[$info_photos['dataprop']]);
+                                                }else{
+                                                        $items['AIPDATA']= $exif[$info_photos['dataprop']];
+                                                }
+                                                if ($info_photos['wording']!=$info_photos['dataprop']){
+                                                }else if (isset($lang['exif_field_'.$info_photos['dataprop']])){
+                                                        $items['AIPWORDING']= $lang['exif_field_'.$info_photos['dataprop']];
+                                                }else{
+                                                        $items['AIPWORDING']= $info_photos['dataprop'];
+                                                }
+                                        }
+                                  }
+                }else if($info_photos['Typ']==6){
+                                        $items['AIPWORDING']=trigger_change('AP_render_content', $info_photos['wording']);
+                                        if (isset($iptc[$info_photos['dataprop']])){
+                                        $items['AIPDATA']=implode(", ", $iptc[$info_photos['dataprop']]);
+                                        }
+                                }else{
+                                        $items['AIPDATA']=trigger_change('AP_render_content', $row['data']);
+                                        
+                }
+                                
 
                 $template->append('add_info_photos', $items);

extensions/manage_properties_photos/language/el_GR/index.php

@@ -1 +1 @@
 <?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );

extensions/manage_properties_photos/language/en_UK/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 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 file is part of Piwigo.                                          |
 // |                                                                       |
-// | 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.                                                                  |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
 // +-----------------------------------------------------------------------+
 

extensions/manage_properties_photos/language/en_UK/plugin.lang.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -36 +36 @@
 $lang['delete data this property'] = 'delete data this property';
 $lang['Choose a property'] = 'Choose a property';
+
+$lang['Text'] = 'Text';
+$lang['select'] = 'select';
+$lang['exif'] = 'exif';
+$lang['date'] = 'date';
+$lang['radio'] = 'radio';
+$lang['IPTC'] = 'IPTC';
+
+$lang['Option List'] = 'Option List';
+$lang['Add Field'] = 'Add Field';
+$lang['Add field for automatic deletion\'s photos on a given date'] = 'Add field for automatic deletion\'s photos on a given date';
+$lang['Remove Field for automatic deletion\'s photos on a given date and all date save'] = 'Remove Field for automatic deletion\'s photos on a given date and all date save';
+$lang['Move description in info table'] = 'Move description in info table';
+$lang['Return description in default location'] = 'Return description in default location';
+$lang['Max field for select or ratio option'] = 'Max field for select or ratio option';
+$lang['The reference photo for exif and IPTC'] = 'The reference photo for exif and IPTC';
+$lang['The reference photo doesn\'t have exif'] = 'The reference photo doesn\'t have exif';
+$lang['The reference photo doesn\'t have IPTC'] = 'The reference photo doesn\'t have IPTC';

extensions/manage_properties_photos/language/fr_FR/index.php

@@ -1 +1 @@
 <?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );

extensions/manage_properties_photos/language/fr_FR/plugin.lang.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -34 +34 @@
 $lang['delete data this property'] = 'supprimer des données de la propriété';
 $lang['Choose a property'] = 'Choisir une propriété';
+
+$lang['Text'] = 'Text';
+$lang['select'] = 'select';
+$lang['exif'] = 'exif';
+$lang['date'] = 'date';
+$lang['radio'] = 'radio';
+$lang['IPTC'] = 'IPTC';
+
+$lang['Option List'] = 'Liste des options';
+$lang['Add Field'] = 'Ajouter un champs';
+$lang['Add field for automatic deletion\'s photos on a given date'] = 'Ajoutez un champs pour supprimer automatiquement les photos à une date';
+$lang['Remove Field for automatic deletion\'s photos on a given date and all date save'] = 'Supprimer le champs pour de suppression automatiquement des photos et les dates programmées';
+$lang['Move description in info table'] = 'Déplacer la description dans la table des propriétées';
+$lang['Return description in default location'] = 'Remettre la description à la place par défaut';
+$lang['Max field for select or ratio option'] = 'Maximum de champs pour les  balises "select" et les boutons "ratio';
+$lang['The reference photo for exif and IPTC'] = 'La photo de référence pour les exifs et IPTC';
+$lang['The reference photo doesn\'t have exif'] = 'La photo de référence ne possède pas d\'exif';
+$lang['The reference photo doesn\'t have IPTC'] = 'La photo de référence ne possède pas IPTC';

extensions/manage_properties_photos/language/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 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 file is part of Piwigo.                                          |
 // |                                                                       |
-// | 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.                                                                  |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
 // +-----------------------------------------------------------------------+
 

extensions/manage_properties_photos/main.inc.php

@@ -10 +10 @@
 
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -38 +38 @@
 if (!defined('ADD_PROP_PHOTO_TABLE')) define('ADD_PROP_PHOTO_TABLE', $prefixeTable.'add_properties_photos');
 if (!defined('ADD_PROP_PHOTO_DATA_TABLE')) define('ADD_PROP_PHOTO_DATA_TABLE', $prefixeTable.'add_properties_photos_data');
+if (!defined('ADD_PROP_PHOTO_DATADATE_TABLE')) define('ADD_PROP_PHOTO_DATADATE_TABLE', $prefixeTable.'add_properties_photos_datadate');
 define('ADD_PROP_PHOTO_ADMIN',get_root_url().'admin.php?page=plugin-'.ADD_PROP_PHOTO_DIR);
 
@@ -57 +58 @@
 }
 
+/*delete photo*/
+    $datedelete = pwg_db_fetch_assoc(pwg_query("SELECT id_prop_pho FROM " . ADD_PROP_PHOTO_TABLE . " WHERE dataprop = 'DeletetePhoto' AND Typ = 2 LIMIT 1;"));
+     if ($datedelete != NULL){
+          $photodelete = pwg_query('
+                        SELECT id_img
+                        FROM '.ADD_PROP_PHOTO_DATADATE_TABLE.'
+                        WHERE datadate <= NOW()
+                        AND id_prop_pho = '.$datedelete['id_prop_pho'].'
+                  ;');
+         if (pwg_db_num_rows($photodelete)) {
+                include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+        while ($delete_photos = pwg_db_fetch_assoc($photodelete)) {
+                        $tab_delete_photos[]=$delete_photos['id_img'];
+            }
+                delete_elements($tab_delete_photos, true);
+                pwg_query('DELETE FROM '.ADD_PROP_PHOTO_DATA_TABLE.' WHERE id_img IN ('.implode(',', $tab_delete_photos).');');
+                pwg_query('DELETE FROM '.ADD_PROP_PHOTO_DATADATE_TABLE.' WHERE id_img IN ('.implode(',', $tab_delete_photos).');');
+                invalidate_user_cache();
+     }
+                
+     }
+
+/*end delete photo*/
+
 ?>

extensions/manage_properties_photos/maintain.class.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-// | Manage Properties Photos plugin for Piwigo                            |
+// | Manage Properties Photos plugin for Piwigo by TEMMII                  |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2014-2016 ddtddt               http://temmii.com/piwigo/ |
+// | Copyright(C) 2007-2020 ddtddt               http://temmii.com/piwigo/ |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -21 +21 @@
 
 defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
+
+/* definie Typ
+0 : default piwigo properties
+1 : properties texte
+2 : properties date
+3 : properties exif
+4 : properties select
+5 : properties ratio
+
+$conf['mpp_idexif'] ** picture id for list exif
+$conf['mpp_max_fields'] ** max fileds for select and ratio default 5
+*/
+
 
 class manage_properties_photos_maintain extends PluginMaintain
@@ -40 +53 @@
 active SMALLINT(5) UNSIGNED NOT NULL ,
 edit SMALLINT(5) UNSIGNED NOT NULL ,
+Typ SMALLINT(5) DEFAULT 1,
+dataprop VARCHAR(255),
 PRIMARY KEY (id_prop_pho))DEFAULT CHARSET=utf8;";
         $result = pwg_query($query);
@@ -50 +65 @@
 PRIMARY KEY (id_img,id_prop_pho))DEFAULT CHARSET=utf8;";
         $result = pwg_query($query);
+        
+if (!defined('ADD_PROP_PHOTO_DATADATE_TABLE')) define('ADD_PROP_PHOTO_DATADATE_TABLE', $prefixeTable.'add_properties_photos_datadate');
+        $query = "CREATE TABLE IF NOT EXISTS ". ADD_PROP_PHOTO_DATADATE_TABLE ." (
+                id_img SMALLINT(5) UNSIGNED NOT NULL ,
+                id_prop_pho SMALLINT(5) UNSIGNED NOT NULL ,
+                datadate datetime ,
+                PRIMARY KEY (id_img,id_prop_pho))DEFAULT CHARSET=utf8;";
+        $result = pwg_query($query);
+
+        
+  
   $activ=unserialize($conf['picture_informations']);
   if($activ['author']==true){$activauteur=0;}else{$activauteur=1;}
@@ -62 +88 @@
   if($activ['rating_score']==true){$activrs=0;}else{$activrs=1;}
   if($activ['privacy_level']==true){$activpl=0;}else{$activpl=1;}
-  $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(id_prop_pho,wording,orderprop,active,edit)VALUES 
-        (1,"author",1,'.$activauteur.',0),
-        (2,"Created on",2,'.$activco.',0),
-        (3,"Posted on",3,'.$activpo.',0),
-        (4,"Dimensions",4,'.$activdim.',0),
-        (5,"File",5,'.$activfile.',0),
-        (6,"Filesize",6,'.$activfilesize.',0),
-        (7,"Tags",7,'.$activtags.',0),
-        (8,"Albums",8,'.$activcategories.',0),
-        (9,"Visits",9,'.$activvisits.',0),
-        (10,"Average",10,'.$activrs.',0),
-        (11,"Who can see this photo?",11,'.$activpl.',0),
-        (12,"Description",12,1,0)
+  $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(id_prop_pho,wording,orderprop,active,edit,Typ)VALUES 
+        (1,"author",1,'.$activauteur.',0,0),
+        (2,"Created on",2,'.$activco.',0,0),
+        (3,"Posted on",3,'.$activpo.',0,0),
+        (4,"Dimensions",4,'.$activdim.',0,0),
+        (5,"File",5,'.$activfile.',0,0),
+        (6,"Filesize",6,'.$activfilesize.',0,0),
+        (7,"Tags",7,'.$activtags.',0,0),
+        (8,"Albums",8,'.$activcategories.',0,0),
+        (9,"Visits",9,'.$activvisits.',0,0),
+        (10,"Average",10,'.$activrs.',0,0),
+        (11,"Who can see this photo?",11,'.$activpl.',0,0)
         ;';
   pwg_query($q); 
-    
+ 
+if (!defined('ADD_PROP_PHOTO_DATADATE_TABLE')) define('ADD_PROP_PHOTO_DATADATE_TABLE', $prefixeTable.'add_properties_photos_datadate');
+        $query = "CREATE TABLE IF NOT EXISTS ". ADD_PROP_PHOTO_DATADATE_TABLE ." (
+id_img SMALLINT(5) UNSIGNED NOT NULL ,
+id_prop_pho SMALLINT(5) UNSIGNED NOT NULL ,
+datadate datetime ,
+PRIMARY KEY (id_img,id_prop_pho))DEFAULT CHARSET=utf8;";
+        $result = pwg_query($query);
+ 
   }
 
@@ -86 +119 @@
   function update($old_version, $new_version, &$errors=array()){
        global $prefixeTable;
-    if (!defined('ADD_PROP_PHOTO_TABLE')) define('ADD_PROP_PHOTO_TABLE', $prefixeTable.'add_properties_photos');
-    $desc = pwg_db_fetch_assoc(pwg_query("SELECT wording FROM " . ADD_PROP_PHOTO_TABLE . " WHERE wording = 'Description' LIMIT 1;"));
-     if ($desc == NULL){
-        $order=pwg_db_fetch_assoc(pwg_query('SELECT orderprop FROM ' . ADD_PROP_PHOTO_TABLE . ' ORDER BY orderprop DESC LIMIT 1;'));    
-        $order=$order['orderprop']+1;
-    $q = 'INSERT INTO ' . $prefixeTable . 'add_properties_photos(wording,orderprop,active,edit)VALUES ("Description",'.$order.',1,0);';
+if (!defined('ADD_PROP_PHOTO_TABLE')) define('ADD_PROP_PHOTO_TABLE', $prefixeTable.'add_properties_photos'); 
+        /*Update to manage Typ select date*/
+        $col = pwg_db_fetch_assoc(pwg_query("SHOW COLUMNS FROM " . ADD_PROP_PHOTO_TABLE . " LIKE 'Typ';"));
+     if ($col == NULL){
+        $q = 'ALTER TABLE '. ADD_PROP_PHOTO_TABLE.' ADD COLUMN `Typ` SMALLINT(5) DEFAULT 1;';   
     pwg_query($q);
-     }
-      
+        $q = 'ALTER TABLE '. ADD_PROP_PHOTO_TABLE.' ADD COLUMN `dataprop` VARCHAR(255);';       
+    pwg_query($q);
+        $q = 'UPDATE '. ADD_PROP_PHOTO_TABLE.' set Typ = 0 where edit =0;';     
+    pwg_query($q);
+         }
+        
+        /*Update for manage date*/
+        if (!defined('ADD_PROP_PHOTO_DATADATE_TABLE')) define('ADD_PROP_PHOTO_DATADATE_TABLE', $prefixeTable.'add_properties_photos_datadate');
+        $datatable= pwg_db_fetch_assoc(pwg_query("SHOW TABLES LIKE '" . ADD_PROP_PHOTO_DATADATE_TABLE . "';"));
+         if ($datatable == NULL){
+                $query = "CREATE TABLE IF NOT EXISTS ". ADD_PROP_PHOTO_DATADATE_TABLE ." (
+                id_img SMALLINT(5) UNSIGNED NOT NULL ,
+                id_prop_pho SMALLINT(5) UNSIGNED NOT NULL ,
+                datadate datetime ,
+                PRIMARY KEY (id_img,id_prop_pho))DEFAULT CHARSET=utf8;";
+                $result = pwg_query($query);
+         }
+ 
   }
   
@@ -102 +150 @@
   function uninstall(){
           global $prefixeTable;
-    $q = 'DROP TABLE ' . $prefixeTable . 'add_properties_photos;';
-    pwg_query($q);
-    $q = 'DROP TABLE ' . $prefixeTable . 'add_properties_photos_data;';
-    pwg_query($q);
+    pwg_query('DROP TABLE ' . $prefixeTable . 'add_properties_photos;');
+    pwg_query('DROP TABLE ' . $prefixeTable . 'add_properties_photos_data;');
+        pwg_query('DROP TABLE ' . $prefixeTable . 'add_properties_photos_datadate;');
   }
 }

extensions/manage_properties_photos/mmp.tpl

@@ +1 @@
+{combine_script id='jquery.ui.sortable' require='jquery.ui' load='footer' path='themes/default/js/ui/minified/jquery.ui.sortable.min.js'}
+{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+{combine_script id='jquery.timepicker' require='jquery.ui.datepicker,jquery.ui.slider' load='footer' path=$ADD_PROP_PHOTO_PATH|@cat:"js/jquery-ui-timepicker-addon.js"}
+{assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
+{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
+{combine_script id="jquery.ui.datepicker-$lang_info.code" load='footer' path=$datepicker_language}
+{/if}
+
+{combine_script id='jquery.chosen' load='footer' path='themes/default/js/plugins/chosen.jquery.min.js'}
+{combine_css path="themes/default/js/plugins/chosen.css"}
+
+{combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
+{combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
+
 {footer_script}
 jQuery(document).ready(function(){
   $("input[name=check_MPP]").change(function(){
     if($(this).is(':checked')){
-          $('#changepro').hide();
+                $('#changeselect').hide();
+                $('#changepro').hide();
+                $('#changeproda').hide();
     }else{
-          $('#changepro').show();
+          $('#selectMPP').val(0).change();
     }
   }); 
+  
+  $('#selectMPP')
+  .change(function () {
+    $("input[name=check_MPP]").attr('checked', false);
+        $('#dataselect').children().remove()
+    var selected = $(':selected', this);
+        var typ=$(':selected', this).data('typ');
+        var dataprop=$(':selected', this).data('dataprop');
+        $('#hidetyp').val(typ);
+        if(typ=='4'){
+                $('#changeselect').show();
+                $('#changepro').hide();
+                $('#changeproda').hide();
+                for (key in dataprop){
+                        $('#dataselect').append(new Option(dataprop[key]));
+                }
+                $('#changeradio').hide();
+                $('#changeradio').empty();              
+        }else if(typ=='2'){
+                $('#changepro').hide();
+                $('#changeproda').show();
+                $('#changeselect').hide();
+                $('#changeradio').hide();
+                $('#changeradio').empty();
+        }else if(typ=='5'){
+                $('#changeselect').hide();
+                $('#changepro').hide();
+                $('#changeproda').hide();
+                $('#changeradio').empty();
+                for (key in dataprop){
+                        $('<input type="radio" name="radioselect" value="'+dataprop[key]+'">'+dataprop[key]+'</input><span style="margin: 0 0 0 10px">').appendTo('#changeradio');
+                }
+                $('#changeradio').show();
+        }else if(typ=='1'){
+                $('#changeselect').hide();
+                $('#changepro').show();
+                $('#changeproda').hide();
+                $('#changeradio').hide();
+                $('#changeradio').empty();
+        }else{
+                $('#changeselect').hide();
+                $('#changepro').hide();
+                $('#changeproda').hide();
+                $('#changeradio').hide();
+                $('#changeradio').empty();              
+        }
+  })
+  .change();
+  
+        $('.dateSelect').datetimepicker({
+                numberOfMonths: 1,
+                changeMonth: true,
+                changeYear: true,
+                yearRange: "1900:+1",
+                dateFormat: "yy-mm-dd",
+                timeText: '{'selection'|@translate|escape:javascript}',
+                hourText: '{'Hour'|@translate|escape:javascript}',
+                minuteText: '{'Minute'|@translate|escape:javascript}',
+                currentText: '{'Now'|@translate|escape:javascript}',
+                closeText: '{'Validate'|@translate|escape:javascript}'
+    });
+  
 });
 {/footer_script}
 <span id="persompp">
   {'Choose a property'|@translate}
-  <br />
-  {html_options name="IDMPP" options=$propertieslist selected=$SELECTEDMPP}
-  <br />
-  <br />
+  <br>
+  <br>
+  <select name="IDMPP" id="selectMPP">
+                
+    {foreach from=$info_select item=infoselect}
+                <option value="{$infoselect.IDINFOPHO}" data-typ="{$infoselect.AIPTYP}" data-dataprop='{$infoselect.AIPDATAPROP}' id="selectMPP{$infoselect.IDINFOPHO}">{$infoselect.AIPWORDING}</option>
+        {/foreach}
+  </select>
+  <br>  
+  <br>
   <input id="check_MPP" type="checkbox" name="check_MPP"> {'delete data this property'|@translate}<br />
-  <div id="changepro">
-    <form method="post" >
-      <textarea rows="3" cols="100" {if $useED==1}placeholder="{'Use Extended Description tags...'|@translate}"{/if} name="dataglob">{$PLUG_MPP}</textarea>
-    </form>
+  <input id="hidetyp" type="hidden" name="invisibleTyp" value="">
+  <div id="changepro" style="display: none;" >
+                <textarea rows="3" cols="100" {if $useED==1}placeholder="{'Use Extended Description tags...'|@translate}"{/if} name="dataglob">{$PLUG_MPP}</textarea>
+  </div>
+  <div id="changeproda" style="display: none;" >
+        <input type="text" class="dateSelect" id="dateSelect" name="datadate" style="width:120px;" value="">
+  </div>
+  <div id="changeselect" style="display: none;" >
+        <select name="dataselect" id="dataselect">
+        </select>
+  </div>
+  <div id="changeradio" style="display: none;" >
   </div>
 </span>