Changeset 26199 for extensions/instagram2piwigo/admin/import.php

Timestamp:

Dec 26, 2013, 12:48:21 PM (10 years ago)

Author:

mistic100

Message:

update for 2.6

File:

• extensions/instagram2piwigo/admin/import.php (modified) (7 diffs)

extensions/instagram2piwigo/admin/import.php

@@ -1 +1 @@
 <?php
-if (!defined('INSTAG_PATH')) die('Hacking attempt!');
+defined('INSTAG_PATH') or die('Hacking attempt!');
 
 set_time_limit(600);
@@ -7 +7 @@
 
 // check API parameters and connect to instagram
-if ( empty($conf['Instagram2Piwigo']['api_key']) or empty($conf['Instagram2Piwigo']['secret_key']) )
-{
-  array_push($page['warnings'], l10n('Please fill your API keys on the configuration tab'));
+if (empty($conf['Instagram2Piwigo']['api_key']) or empty($conf['Instagram2Piwigo']['secret_key']))
+{
+  $page['warnings'][] = l10n('Please fill your API keys on the configuration tab');
   $_GET['action'] = 'error';
 }
 else if (!function_exists('curl_init'))
 {
-  array_push($page['errors'], l10n('No download method available').' (cURL)');
+  $page['errors'][] = l10n('No download method available').' (cURL)';
   $_GET['action'] = 'error';
 }
@@ -25 +25 @@
     
     $auth_config = array(
-        'client_id'         => $conf['Instagram2Piwigo']['api_key'],
-        'client_secret'     => $conf['Instagram2Piwigo']['secret_key'],
-        'redirect_uri'      => get_absolute_root_url() . INSTAG_ADMIN . '-import',
-    );
+      'client_id'     => $conf['Instagram2Piwigo']['api_key'],
+      'client_secret' => $conf['Instagram2Piwigo']['secret_key'],
+      'redirect_uri'  => get_absolute_root_url() . INSTAG_ADMIN . '-import',
+      );
     
     $auth = new Instagram_Auth($auth_config);
@@ -57 +57 @@
 
 
-if (!isset($_GET['action'])) $_GET['action'] = 'main';
+if (!isset($_GET['action']))
+{
+  $_GET['action'] = 'main';
+}
 
 
@@ -142 +145 @@
     if ($duplicates>0)
     {
-      $page['infos'][] = '<a href="admin.php?page=batch_manager&amp;prefilter=instagram">'
-          .l10n_dec('One picture is not displayed because already existing in the database.', '%d pictures are not displayed because already existing in the database.', $duplicates)
+      $page['infos'][] = '<a href="admin.php?page=batch_manager&amp;filter=prefilter-instagram">'
+          .l10n_dec(
+            'One picture is not displayed because already existing in the database.',
+            '%d pictures are not displayed because already existing in the database.',
+            $duplicates)
         .'</a>';
     }
@@ -195 +201 @@
     if (isset($_POST['done']))
     {
-      $_SESSION['page_infos'][] = sprintf(l10n('%d pictures imported'), $_POST['done']);
+      $_SESSION['page_infos'][] = l10n('%d pictures imported', $_POST['done']);
     }
     redirect(INSTAG_ADMIN . '-import');
@@ -204 +210 @@
 $template->assign('ACTION', $_GET['action']);
 
-$template->set_filename('Instagram2Piwigo', dirname(__FILE__) . '/template/import.tpl');
-
-?>
+$template->set_filename('Instagram2Piwigo', realpath(INSTAG_PATH . 'admin/template/import.tpl'));