Changeset 32229

Timestamp:

Jun 3, 2020, 11:02:41 PM (4 years ago)

Author:

ddtddt

Message:

[Meta_OG] add chose albums for list photos / options use other image for album and photo

Location:

extensions/meta_og

Files:

• admin.php (modified) (6 diffs)
• admin.tpl (modified) (2 diffs)
• include (added)
• include/function.mog.inc.php (added)
• initadmin.php (modified) (5 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• maintain.class.php (modified) (2 diffs)
• mog_adminalbum.tpl (modified) (2 diffs)
• mog_adminphoto.tpl (modified) (2 diffs)

extensions/meta_og/admin.php

@@ -24 +24 @@
 global $template, $conf, $user;
 include_once(PHPWG_ROOT_PATH .'admin/include/tabsheet.class.php');
-
+include_once(metaog_PATH . 'include/function.mog.inc.php');
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
@@ -48 +48 @@
  case 'gestion':
                 global $pwg_loaded_plugins;
+        
 $metaogpagelistT = array(
     l10n('Select Page'),
@@ -122 +123 @@
         }
         $metaog['path']='';
-        $tab_picture = pwg_query('SELECT id,file,name,path FROM ' . IMAGES_TABLE . ' order by id;');
+        $tab_picture = listphotosmog();
         if (pwg_db_num_rows($tab_picture)) {
         while ($info_photos = pwg_db_fetch_assoc($tab_picture)) {
@@ -183 +184 @@
  break;
  case 'config':
-
+ 
+$mog1T = array(
+    '    '.l10n('no photos and albums pages'),
+    '    '.l10n('photos pages'),
+    '    '.l10n('albums pages'),
+        '    '.l10n('photos and albums pages'),
+  );
+
+$mog1 = array(
+    '1',
+    '2',
+    '3',
+        '4',
+  );    
+
+$template->assign('mog1T', $mog1T);
+$template->assign('mog1', $mog1); 
+ 
 $metaogsizelistT = array(
     '2s : '.l10n('size thumbnails modus'),
@@ -247 +265 @@
 $template->assign('metaogtwcalist', $metaogtwcalist);
 $template->assign('metaogtwcalistT', $metaogtwcalistT);
-  
+
+$listchose=safe_unserialize($conf['moglista']);
+if(!isset($conf['mogshowpa'])){$conf['mogshowpa']=1;}
   
     $template->assign(
@@ -258 +278 @@
                 'MOGTS' => $conf['mogtwsite'],
                 'MOGTCR' => $conf['mogtwcreator'],
+                'MOGSPA' => $conf['mogshowpa'],
+                'choose_albums' => $listchose,
     ));
         
   if (isset($_POST['submitogconfig'])){
-    conf_update_param('mogsize', $_POST['metaogconfigsize']);
+    conf_update_param('mogshowpa', $_POST['metaogconfishowpa']);
+        conf_update_param('moglista', $_POST['moglistea']);
+        conf_update_param('mogsize', $_POST['metaogconfigsize']);
     conf_update_param('fb:app_id', $_POST['metaogconfigfb']);
   if (isset($_POST['metaogconfiglo'])){ 

extensions/meta_og/admin.tpl

@@ +1 @@
+{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
+{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
+{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
 {footer_script}
 jQuery(function($) {
+
+{* <!-- CATEGORIES --> *}
+var categoriesCache = new CategoriesCache({
+  serverKey: '{$CACHE_KEYS.categories}',
+  serverId: '{$CACHE_KEYS._hash}',
+  rootUrl: '{$ROOT_URL}'
+});
+
+categoriesCache.selectize(jQuery('[data-selectize=categories]'));
 
 if($('#metaogimagesaveid').children("option:selected").val()=="-20"){
@@ -123 +135 @@
   <form method="post" >
     <fieldset id="mainConf">
+          <strong>{'Customize meta Open Graph image'|@translate}</strong> 
+      <div style="margin: 0 0 0 20px" class="mogradio">{html_radios separator="<br>" name="metaogconfishowpa" values=$mog1 output=$mog1T selected="{$metaogconfig.MOGSPA}"}</div>
+          <br>
+          <strong>{'albums for list choose photos for Open Graph image'|@translate}</strong>
+      <br>
+      <select data-selectize="categories" data-value="{$metaogconfig.choose_albums|@json_encode|escape:html}"
+        placeholder="{'Type in a search term'|translate}"
+        name="moglistea[]" multiple style="width:600px;"></select>
+          <br>
           {'Size for Open Graph metadata'|@translate}&nbsp;:<br>
           {html_options name="metaogconfigsize" values=$metaogsizelist output=$metaogsizelistT selected=$metaogconfig.MOGsize}

extensions/meta_og/initadmin.php

@@ -21 +21 @@
 
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
+include_once(metaog_PATH . 'include/function.mog.inc.php');
 //Add link menu
 add_event_handler('get_admin_plugin_menu_links', 'metaog_admin_menu');
@@ -60 +60 @@
                 $metaog['metaogimage']='';
         }
-        $tab_picture = pwg_query('SELECT id,file,name,path FROM ' . IMAGES_TABLE . ' order by id;');
-        if (pwg_db_num_rows($tab_picture)){
+        if($conf['mogshowpa']==2||$conf['mogshowpa']==4){
+        $tab_picture = listphotosmog();
+         if (pwg_db_num_rows($tab_picture)){
       while ($info_photos = pwg_db_fetch_assoc($tab_picture)) {
                 if($info_photos['id']==$metaog['metaogimage']){
@@ -81 +82 @@
                 $template->append('info_photos', $items);
       }
-    }
-  if (empty($metaog['metaogimage'])){unset($metaog['metaogimage']);}
-  if(isset($metaog['metaogimage'])){    
+   }
+   if (empty($metaog['metaogimage'])){unset($metaog['metaogimage']);}
+   if(isset($metaog['metaogimage'])){   
           $metaogpath=get_absolute_root_url().PWG_DERIVATIVE_DIR.substr($metaog['path'], 2, -4)."-th".substr($metaog['path'],-4);
-        }else{
+   }else{
           $metaogpath="";
           $metaog['metaogimage']="";
-        }
+   }
+   $template->assign('SHOWMOGI', "1");
+  }else{
+   $template->assign('SHOWMOGI', "0");
+  }
   $template->assign(
     'metaog_editP',
@@ -147 +152 @@
                 $metaog['metaogimage']='';
         }
-        $tab_picture = pwg_query('SELECT id,file,name,path FROM ' . IMAGES_TABLE . ' order by id;');
+        if($conf['mogshowpa']==3||$conf['mogshowpa']==4){
+        $tab_picture = listphotosmog();
         $metaog['path']='';
         if (pwg_db_num_rows($tab_picture)){
@@ -173 +179 @@
           $metaogpath="";
           $metaog['metaogimage']="";
+        }
+        $template->assign('SHOWMOGI', "1");
+        }else{
+          $template->assign('SHOWMOGI', "0");
         }
   $tab_album = pwg_db_fetch_assoc(pwg_query("SELECT id,representative_picture_id FROM " . CATEGORIES_TABLE . " WHERE id = '".$_GET['cat_id']."';"));

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

@@ -58 +58 @@
 $lang['This ID isn\'t used in your gallery'] = 'This ID isn\'t used in your gallery';
 $lang['or'] = 'or';
+$lang['Customize meta Open Graph image'] = 'Customize meta Open Graph image';
+$lang['no photos and albums pages'] = 'no photos and albums pages';
+$lang['photos pages'] = 'photos pages';
+$lang['albums pages'] = 'albums pages';
+$lang['photos and albums pages'] = 'photos and albums pages';
+$lang['albums for list choose photos for Open Graph image'] = 'albums for list choose photos for Open Graph image';

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

@@ -22 +22 @@
 $lang['Manage tags metadata Open Graph'] = 'Gérer les balises metadonnées Open Graph';
 $lang['Add Open Graph metadata'] = 'Ajouter des metadonnées OPEN GRAPH';
-$lang['Select Page'] = 'Sélectionner la Page';
+$lang['Select Page'] = 'Selectionner la Page';
 $lang['You must select a page'] = 'Vous devez selectionner une page';
 $lang['Metadata Open Graph updated'] = 'Metadonnées Open Graph mis à jour';
@@ -56 +56 @@
 $lang['share your pages with a full width picture and informations'] = 'partager votre page avec l\'image taille réelle et les informations';
 $lang['share your pages with a small squared thumbnail and informations'] = 'partager votre page avec l\'image réduite et les informations';
+$lang['Customize meta Open Graph image'] = 'Personalise meta Open Graph image';
+$lang['no photos and albums pages'] = 'ni sur les pages des photos ni des albums';
+$lang['photos pages'] = 'sur les pages des photos';
+$lang['albums pages'] = 'sur les pages des albums';
+$lang['photos and albums pages'] = 'sur les pages des photos et des albums';
+$lang['albums for list choose photos for Open Graph image'] = 'Albums pour la Liste des photos pour Open Graph image';

extensions/meta_og/main.inc.php

@@ -37 +37 @@
 $conf['mogtwsite'] > for twitter:site
 $conf['mogtwcreator'] > for twitter:creator
+$conf['mogshowpa'] > for change meta og photo on photo or album page
+$conf['moglista'] > list album for meta og photo
 
 type

extensions/meta_og/maintain.class.php

@@ -51 +51 @@
    conf_update_param('mogtwcard','');
    conf_update_param('mogtwsite','');
-   conf_update_param('mogtwcreator','');   
+   conf_update_param('mogtwcreator','');
+   conf_update_param('mogshowpa','1');  
    }
 
@@ -69 +70 @@
         conf_delete_param('mogtwsite','');
         conf_delete_param('mogtwcreator',''); 
+        conf_delete_param('mogshowpa','');
+        conf_delete_param('moglista','');
   }
 }

extensions/meta_og/mog_adminalbum.tpl

@@ -77 +77 @@
         <br>    
         <br>
+  {if ($SHOWMOGI==1)}   
           <span style="margin: 0 0 0 20px">{'Metadata Open Graph link image'|@translate}</span>
         <br>
@@ -94 +95 @@
         <br>
           <img id="metaogimagescrA" src="{$metaog_editA.metaogpath}"><br>
-        <br>    
+        <br>
+  {/if} 
 </p>
 <p style="margin:0">';

extensions/meta_og/mog_adminphoto.tpl

@@ -72 +72 @@
         <br>
           <span style="margin: 0 0 0 20px"><textarea rows="2" cols="60" name="metaogdescriptionsaveP" id="metaogdescriptionsaveP" class="metaogdescriptionsaveP">{$metaog_editP.metaogdescription}</textarea></span>
-        <br>    
         <br>
-          <span style="margin: 0 0 0 20px">{'Metadata Open Graph link image'|@translate}</span>
+        <br>
+  {if ($SHOWMOGI==1)}   
+        <span style="margin: 0 0 0 20px">{'Metadata Open Graph link image'|@translate}</span>
         <br>
           <span style="margin: 0 0 0 20px">
@@ -91 +92 @@
                 <br>
                         <img id="metaogimagescrP" src="{$metaog_editP.metaogpath}"><br>
-                <br>    
+                <br>
+  {/if}
 </p>
 <p style="margin:40px 0 0 0">