Changeset 32106


Ignore:
Timestamp:
Apr 17, 2020, 12:26:44 AM (4 years ago)
Author:
ddtddt
Message:

[Meta_OG] add support page contact and AP

Location:
extensions/meta_og
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • extensions/meta_og/admin.php

    r32103 r32106  
    6464        l10n('Notification'),
    6565  );
    66  
     66
    6767$metaogpagelist = array(
    6868    '',
     
    8181        'notification',
    8282  );
    83  
     83$MPC = pwg_db_fetch_assoc(pwg_query("SELECT state FROM " . PLUGINS_TABLE . " WHERE id = 'ContactForm';"));
     84  if ($MPC['state'] == 'active'){
     85        $metaogpagelistT[]=l10n('contact');
     86        $metaogpagelist[]='contact';
     87  }
     88$MAP = pwg_db_fetch_assoc(pwg_query("SELECT state FROM " . PLUGINS_TABLE . " WHERE id = 'AdditionalPages';"));
     89  if ($MAP['state'] == 'active') { 
     90    $result = pwg_query('SELECT id,title FROM ' . ADD_PAGES_TABLE . ' ORDER BY id ASC;');
     91        while ($row = pwg_db_fetch_assoc($result)) {
     92          $metaogpagelistT[]=l10n('Additional Page').' : '.$row['title'];
     93          $metaogpagelist[]=$row['id'];
     94        }
     95 
     96 
     97  }
    8498    $template->assign(
    8599    'metagestion',
     
    97111        }
    98112        $pageog=$_POST['metaoglist'];
    99     $metaog = pwg_db_fetch_assoc(pwg_query("SELECT * FROM " . METAOG_TABLE . " WHERE type = 1 AND page = '".$_POST['metaoglist']."';"));
     113    if(is_numeric($pageog)){$type='4';}else{$type='1';}
     114        $metaog = pwg_db_fetch_assoc(pwg_query("SELECT * FROM " . METAOG_TABLE . " WHERE type = ".$type." AND page = '".$_POST['metaoglist']."';"));
    100115        if(empty($metaog)){
    101116                $metaog['id']='';
     
    161176        pwg_query($query);
    162177        }else{
    163         $q = 'INSERT INTO ' . $prefixeTable . 'metaog(type,page,metaogtitle,metaogdescription,metaogimage)VALUES (1,"' . $_POST['metaogpage'] . '","' . $_POST['metaogtitlesave'] . '","' . $_POST['metaogdescriptionsave'] . '","' . $_POST['metaogimagesave'] .'");';
     178if(is_numeric($_POST['metaogpage'])){$type='4';}else{$type='1';}               
     179        $q = 'INSERT INTO ' . $prefixeTable . 'metaog(type,page,metaogtitle,metaogdescription,metaogimage)VALUES ('.$type.',"' . $_POST['metaogpage'] . '","' . $_POST['metaogtitlesave'] . '","' . $_POST['metaogdescriptionsave'] . '","' . $_POST['metaogimagesave'] .'");';
    164180    pwg_query($q);
    165181    }
  • extensions/meta_og/admin.tpl

    r32103 r32106  
    8484          <br>
    8585          <br>
    86           twitter:card : {'The card type, which will be one of summary, summary_large_image, app, or player.'|@translate}<br>
     86          twitter:card : {'The card type, which will be one of summary or summary_large_image.'|@translate}<br>
    8787          {html_options name="metaogconfigtwca" values=$metaogtwcalist output=$metaogtwcalistT selected=$metaogconfig.MOGTCA}
    8888          <br> 
  • extensions/meta_og/initadmin.php

    r32083 r32106  
    6868                  <select name="metaogimagesaveP">
    6969                        <option value="a">-----</option>
    70                         <option value="b">{\'no photo\'|@translate}no photo</option>
     70                        <option value="b">{\'no photo\'|@translate}</option>
    7171                          {foreach from=$info_photos item=infophoto}
    7272                                <option value="{$infophoto.PHOTOID}" {$infophoto.PHOTOSELECT}>{$infophoto.PHOTOINFO}</option>
     
    9696                $metaog['metaogimage']='';
    9797        }
    98         $tab_picture = pwg_query('SELECT id,name,path FROM ' . IMAGES_TABLE . ' order by id;');
     98        $tab_picture = pwg_query('SELECT id,file,name,path FROM ' . IMAGES_TABLE . ' order by id;');
    9999        if (pwg_db_num_rows($tab_picture)){
    100100      while ($info_photos = pwg_db_fetch_assoc($tab_picture)) {
     
    105105                  $select="";
    106106                }
     107          if(empty($info_photos['name'])){$legend=$info_photos['file'];}else{$legend=$info_photos['name'];}
    107108                $items = array(
    108109                  'PHOTOID' => $info_photos['id'],
    109                   'PHOTOINFO' => $info_photos['id'].' - '.$info_photos['name'],
     110                  'PHOTOINFO' => $info_photos['id'].' - '.$legend,
    110111                  'PHOTOSELECT' => $select,
    111112                );
     
    161162                  $select="";
    162163                }
     164          if(empty($info_photos['name'])){$legend=$info_photos['file'];}else{$legend=$info_photos['name'];}
    163165                $items = array(
    164166                  'PHOTOID' => $info_photos['id'],
    165                   'PHOTOINFO' => $info_photos['id'].' - '.$info_photos['name'],
     167                  'PHOTOINFO' => $info_photos['id'].' - '.$legend,
    166168                  'PHOTOSELECT' => $select,
    167169                );
     
    233235                  <select name="metaogimagesaveA">
    234236                        <option value="a">-----</option>
    235                         <option value="b">{\'no photo\'|@translate}no photo</option>
     237                        <option value="b">{\'no photo\'|@translate}</option>
    236238                          {foreach from=$info_photos item=infophoto}
    237239                                <option value="{$infophoto.PHOTOID}" {$infophoto.PHOTOSELECT}>{$infophoto.PHOTOINFO}</option>
     
    261263                $metaog['metaogimage']='';
    262264        }
    263         $tab_picture = pwg_query('SELECT id,name,path FROM ' . IMAGES_TABLE . ' order by id;');
     265        $tab_picture = pwg_query('SELECT id,file,name,path FROM ' . IMAGES_TABLE . ' order by id;');
    264266        $metaog['path']='';
    265267        if (pwg_db_num_rows($tab_picture)){
     
    271273                  $select="";
    272274                }
     275          if(empty($info_photos['name'])){$legend=$info_photos['file'];}else{$legend=$info_photos['name'];}
    273276                $items = array(
    274277                  'PHOTOID' => $info_photos['id'],
    275                   'PHOTOINFO' => $info_photos['id'].' - '.$info_photos['name'],
     278                  'PHOTOINFO' => $info_photos['id'].' - '.$legend,
    276279                  'PHOTOSELECT' => $select,
    277280                );
     
    330333                  $select="";
    331334                }
     335          if(empty($info_photos['name'])){$legend=$info_photos['file'];}else{$legend=$info_photos['name'];}
    332336                $items = array(
    333337                  'PHOTOID' => $info_photos['id'],
    334                   'PHOTOINFO' => $info_photos['id'].' - '.$info_photos['name'],
     338                  'PHOTOINFO' => $info_photos['id'].' - '.$legend,
    335339                  'PHOTOSELECT' => $select,
    336340                );
  • extensions/meta_og/language/en_UK/plugin.lang.php

    r32105 r32106  
    5252$lang['@username for the website used in the card footer'] = '@username for the website used in the card footer';
    5353$lang['@username for the content creator / author.'] = '@username for the content creator / author.';
     54$lang['contact'] = 'contact';
     55$lang['Additional Page'] = 'Additional Page';
  • extensions/meta_og/language/fr_FR/plugin.lang.php

    r32077 r32106  
    3434$lang['Metadata Open Graph title'] = 'Metadonnées Open Graph title';
    3535$lang['Metadata Open Graph description'] = 'Metadonnées Open Graph description';
    36 $lang['Metadata Open Graph link image'] = 'Metadonnées Open Graph link image';
     36$lang['Metadata Open Graph link image'] = 'Metadonnées Open Graph lien de image';
    3737$lang['use photo for this page'] = 'utilisation de la photo de cette page';
    3838$lang['use representative photo for this album'] = 'utilisation de la photo représentative de cet album';
     
    4747$lang['no delault language'] = 'Pas de langue par delaut';
    4848$lang['Site name for Open Graph'] = 'Nom du site pour la balise Open Graph';
     49$lang['contact'] = 'contact';
     50$lang['Additional Page'] = 'Page additionelle';
    4951?>
  • extensions/meta_og/main.inc.php

    r32103 r32106  
    130130  }
    131131 }else if(isset($page['section']) and empty($page['category']['id']))  {
    132         $metaog = pwg_db_fetch_assoc(pwg_query("SELECT * FROM " . METAOG_TABLE . " WHERE type = 1 AND page = '".$page['section']."';"));
     132                if($page['section'] == 'additional_page'){
     133                   $metaog = pwg_db_fetch_assoc(pwg_query("SELECT * FROM " . METAOG_TABLE . " WHERE type =4 AND page = '".$page['additional_page']['id']."';"));
     134                }else{
     135                   $metaog = pwg_db_fetch_assoc(pwg_query("SELECT * FROM " . METAOG_TABLE . " WHERE type =1 AND page = '".$page['section']."';"));
     136                }
    133137  if(empty($metaog)){
    134138        $metaog['metaogtitle']='';
     
    153157        $metaog['metaogimage']='';
    154158  }
     159
    155160  if(!empty($metaog['metaogimage']) AND $conf['mogsize']!='original'){
    156161        $images = pwg_db_fetch_assoc(pwg_query("SELECT id,path FROM " . IMAGES_TABLE . " WHERE id = '".$metaog['metaogimage']."';"));
Note: See TracChangeset for help on using the changeset viewer.