Changeset 27391

Timestamp:

Feb 16, 2014, 10:40:14 PM (10 years ago)

Author:

ddtddt

Message:

[extensions] - see_photos_by_user - new options

Location:

extensions/see_photos_by_user

Files:

• admin.php (added)
• admin.tpl (added)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.inc.php (added)
• pagespba.php (modified) (2 diffs)
• pagespba.tpl (modified) (1 diff)

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

@@ -2 +2 @@
 $lang['See photos by user'] = 'See photos by user';
 $lang['select user'] = 'select user';
-$lang['sumit']= 'sumit';
+$lang['select other user'] = 'select other user';
+$lang['sumit'] = 'sumit';
+$lang['users in alphabetical order'] = 'users in alphabetical order';
+$lang['users by reverse alphabetical order'] = 'users by reverse alphabetical order';
+$lang['by increasing number of photos'] = 'by increasing number of photos';
+$lang['by decreasing number of photos'] = 'by decreasing number of photos';
+$lang['Minimal number photos for show users'] = 'Minimal number photos for show users';
+$lang['Maximal number users'] = 'Maximal number users';
+$lang['users order'] = 'users order';
+
 ?>

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

@@ -1 +1 @@
 <?php
 $lang['See photos by user'] = 'Voir photos par utilisateur';
-$lang['select user'] = 'selectionne un utilisateur';
-$lang['sumit']= 'Valider';
+$lang['select user'] = 'selectionner un utilisateur';
+$lang['select other user'] = 'selectionner un autre utilisateur';
+$lang['sumit'] = 'Valider';
+$lang['users in alphabetical order'] = 'utilisateurs par ordre alphabètique';
+$lang['users by reverse alphabetical order'] = 'utilisateurs par ordre inversement alphabètique';
+$lang['by increasing number of photos'] = 'par nombre de photos croissant';
+$lang['by decreasing number of photos'] = 'par nombre de photos décroissant';
+$lang['Minimal number photos for show users'] = 'Mombre minimal de photos pour montrer les utilisateurs';
+$lang['Maximal number users'] = 'nombre maximal d\utilisateurs';
+$lang['users order'] = 'ordre des utilisateurs';
 ?>

extensions/see_photos_by_user/main.inc.php

@@ -13 +13 @@
 define('SPBA_DIR' , basename(dirname(__FILE__)));
 define('SPBA_PATH' , PHPWG_PLUGINS_PATH . SPBA_DIR . '/');
+load_language('plugin.lang', SPBA_PATH);
 
+add_event_handler('blockmanager_apply' , 'add_link_SPBA');
 function add_link_SPBA($menu_ref_arr)
  {
@@ -24 +26 @@
    array_splice
          ($block->data, $position-1, 0, array
-          ('See_photos_by_user' =>
+          ('user-' =>
       array
                          (
-                         'URL' => make_index_url(array('section' => 'See_photos_by_user')),
+                         'URL' => make_index_url(array('section' => 'user-')),
                          'TITLE' => l10n('See photos by user'),
                          'NAME' => l10n('See photos by user')
@@ -36 +38 @@
  }
 
+add_event_handler('loc_end_section_init', 'section_init_SPBA');
 function section_init_SPBA()
 {
-  global $tokens;
-  if (in_array('See_photos_by_user', $tokens))
-  include(SPBA_PATH . 'pagespba.php');
+ global $tokens;
+$testd = explode('user-', $_SERVER['REQUEST_URI']); 
+if (!empty ($testd[1]))
+{$me = 'user-'.$testd[1];}
+else
+{$me = 'user-';}
+
+ if (in_array($me, $tokens))
+ include(SPBA_PATH . 'pagespba.php');
 }
 
-add_event_handler('blockmanager_apply' , 'add_link_SPBA');
-add_event_handler('loc_end_section_init', 'section_init_SPBA');
 
+add_event_handler('get_admin_plugin_menu_links', 'SPBA_admin_menu');
+function SPBA_admin_menu($menu)
+{
+  array_push(
+    $menu,
+    array(
+      'NAME' => l10n('See photos by user'),
+      'URL' => get_admin_plugin_menu_link(SPBA_PATH . 'admin.php')
+          //'URL' => get_root_url().'admin.php?page=plugin-See_photos_by_user'
+      )
+    );
+  
+  return $menu;
+}
 
 ?>

extensions/see_photos_by_user/pagespba.php

@@ -1 +1 @@
 <?php
-
 load_language('plugin.lang', SPBA_PATH);
 
 global $page, $conf, $user, $template;
-$page['section'] = 'See_photos_by_author';
-  
+
+$testd = explode('user-', $_SERVER['REQUEST_URI']); 
+if (!empty ($testd[1]))
+{$me = 'user-'.$testd[1];
+$page['section'] = $me;
+
+$query = '
+SELECT id, username
+ FROM ' . USERS_TABLE . '
+ WHERE username = \''.$testd[1].'\'
+;';
+$result = pwg_query($query);
+$row = pwg_db_fetch_assoc($result);
+  $template->assign(
+    'gestionB',
+    array(
+      'USERUSBU' => $testd[1],
+      ));
+
+$query = '
+SELECT DISTINCT(id)
+ FROM '.IMAGES_TABLE.'
+ INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
+ '.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'id'
+      ),
+    'WHERE'
+  ).'
+ AND added_by = \''.$row['id'].'\'
+ '.$conf['order_by'].'
+;';
+$page = array_merge
+(
+ $page,
+ array
+ (
+'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'.$me.'</a>',
+'items' => array_from_query($query, 'id'),
+ )
+);
+}
+else
+{
+$me = 'user-';
+$page['section'] = $me;
+}
 //read auteur list
 $groups = array();
+
 $query = '
-select id,username
-  FROM ' . USERS_TABLE . '
-  WHERE id<>2 
-  ORDER BY username ASC;';
+SELECT UT.id, UT.username, COUNT(IT.id) AS PBU, IT.id
+ FROM ' . USERS_TABLE . ' as UT
+ INNER JOIN '.IMAGES_TABLE.' AS IT ON IT.added_by = UT.id
+ INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON IT.id = ic.image_id
+  '.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'id'
+      ),
+    'WHERE'
+  ).'
+ GROUP BY IT.added_by
+ HAVING PBU >'.$conf['see_photos_by_user_nbphotos'].'
+ ORDER BY '.$conf['see_photos_by_user_order'].'
+ LIMIT '.$conf['see_photos_by_user_limit'].';';
+
 $result = pwg_query($query);
 
 while ($row = pwg_db_fetch_assoc($result))
  {
-  $groups[$row['id']] = $row['username'];
+  $groups[$row['username']] = $row['username'].' ('.$row['PBU'].')';
 }
   $selected = 0;
-        $options[] = l10n('select user');
+  if (empty ($testd[1]))
+        {$options[] = l10n('select user');}
+ else
+  {$options[] = l10n('select other user');}
         $options['a'] = '----------------------';
 
@@ -36 +103 @@
 if (isset($_POST['submitchoixauteur']))
  {
-     $forbidden = get_sql_condition_FandF(
-     array( 'visible_images' => 'id' ),
-    'AND'
-          );
-          
-  $page['section'] = 'See_photos_by_author';
+ $redirect_url = get_root_url().'index.php?/user-'.($_POST['metalist']);
+ redirect($redirect_url);
+ }
 
-    $query = '
-  SELECT DISTINCT(id)
-  FROM '.IMAGES_TABLE.'
-  INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
-  WHERE added_by = \''.$_POST['metalist'].'\'
-    '.$forbidden.'
-    '.$conf['order_by'].'
-  ;';
-
-   $page = array_merge(
-  $page,
-  array(
-    'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'.l10n('See photos by author').'</a>',
-    'items' => array_from_query($query, 'id'),
-      )
-     );
-          
-//read auteur list
-$groups = array();
-$query = '
- select id,username
-  FROM ' . USERS_TABLE . '
-  WHERE id<>2 
-  ORDER BY username ASC;';
-$result = pwg_query($query);
-
-while ($row = pwg_db_fetch_assoc($result))
-        {
-  $groups[$row['id']] = $row['username'];
-        }
-  $selected = $_POST['metalist'];
-
-  foreach ($groups as $metalist => $metalist2)
-        {
-    $options[$metalist] = $metalist2;
-        }
-  $template->assign(
-    'gestionA',
-    array(
-     'OPTIONS' => $options,
-     'SELECTED' => $selected
-     ));
- }
 $template->assign('SPBA2', 'toto');
 $template->set_filename('SPBA', realpath(SPBA_PATH.'pagespba.tpl'));
 $template->assign_var_from_handle('CONTENT', 'SPBA');
-
 ?>

extensions/see_photos_by_user/pagespba.tpl

@@ -4 +4 @@
  </form>
 {/if}
+{if isset ($gestionB)}
+<h1>{'User'|@translate} {$gestionB.USERUSBU}</h1>
+{/if}