Changeset 13488

Timestamp:

Mar 6, 2012, 9:27:41 PM (12 years ago)

Author:

rvelices

Message:

remove remote sites feature

Location:

trunk

Files:

• admin/site_manager.php (modified) (7 diffs)
• admin/site_reader_remote.php (deleted)
• admin/site_update.php (modified) (2 diffs)
• admin/themes/default/template/site_manager.tpl (modified) (2 diffs)
• include/functions.inc.php (modified) (1 diff)
• include/functions_xml.inc.php (deleted)
• language/en_UK/admin.lang.php (modified) (9 diffs)
• tools/create_listing_file.php (deleted)
• tools/create_listing_file_local.inc.php (deleted)

trunk/admin/site_manager.php

@@ -39 +39 @@
 }
 
-/**
- * requests the given $url (a remote create_listing_file.php) and fills a
- * list of lines corresponding to request output
- *
- * @param string $url
- * @return void
- */
-function remote_output($url)
-{
-  global $template, $page;
-
-  if (fetchRemote($url, $result))
-  {
-    $lines = explode("\r\n", $result);
-    // cleaning lines from HTML tags
-    foreach ($lines as $line)
-    {
-      $line = trim(strip_tags($line));
-      if (preg_match('/^PWG-([A-Z]+)-/', $line, $matches))
-      {
-        $template->append(
-          'remote_output',
-          array(
-            'CLASS' => 'remote'.ucfirst(strtolower($matches[1])),
-            'CONTENT' => $line
-           )
-         );
-      }
-    }
-  }
-  else
-  {
-    array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found'));
-  }
-}
-
-
 // +-----------------------------------------------------------------------+
 // |                             template init                             |
@@ -87 +50 @@
 {
   $is_remote = url_is_remote( $_POST['galleries_url'] );
+  if ($is_remote)
+  {
+    fatal_error('remote sites not supported');
+  }
   $url = preg_replace('/[\/]*$/', '', $_POST['galleries_url']);
   $url.= '/';
-  if (! $is_remote)
+  if ( ! (strpos($url, '.') === 0 ) )
   {
-    if ( ! (strpos($url, '.') === 0 ) )
-    {
-      $url = './' . $url;
-    }
+    $url = './' . $url;
   }
 
@@ -111 +75 @@
   if (count($page['errors']) == 0)
   {
-    if ($is_remote)
+    if ( ! file_exists($url) )
     {
-      if ( ! isset($_POST['no_check']) )
-      {
-        $clf_url = $url.'create_listing_file.php';
-        $get_data = array(
-          'action' => 'test',
-          'version' => PHPWG_VERSION,
-        );
-        if (fetchRemote($clf_url, $result, $get_data))
-        {
-          $lines = explode("\r\n", $result);
-          $first_line = strip_tags($lines[0]);
-          if (!preg_match('/^PWG-INFO-2:/', $first_line))
-          {
-            array_push($page['errors'],
-                       l10n('an error happened').' : '.$first_line);
-          }
-        }
-        else
-        {
-          array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found') );
-        }
-      }
-    }
-    else
-    { // local directory
-      if ( ! file_exists($url) )
-      {
-        array_push($page['errors'],
-          l10n('Directory does not exist').' ['.$url.']');
-      }
+      array_push($page['errors'],
+        l10n('Directory does not exist').' ['.$url.']');
     }
   }
@@ -177 +113 @@
   switch($_GET['action'])
   {
-    case 'generate' :
-    {
-      $title = $galleries_url.' : '.l10n('generate listing');
-      remote_output($galleries_url.'create_listing_file.php?action=generate');
-      break;
-    }
-    case 'test' :
-    {
-      $title = $galleries_url.' : '.l10n('test');
-      remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION);
-      break;
-    }
-    case 'clean' :
-    {
-      $title = $galleries_url.' : '.l10n('clean');
-      remote_output($galleries_url.'create_listing_file.php?action=clean');
-      break;
-    }
     case 'delete' :
     {
@@ -212 +130 @@
     )
   );
-
-// +-----------------------------------------------------------------------+
-// |                           remote sites list                           |
-// +-----------------------------------------------------------------------+
-
-if ( is_file(PHPWG_ROOT_PATH.'listing.xml') )
-{
-  $xml_content = getXmlCode(PHPWG_ROOT_PATH.'listing.xml');
-  $local_listing_site_url = getAttribute(
-          getChild($xml_content, 'informations'),
-          'url'
-        );
-  if ( !url_is_remote($local_listing_site_url) )
-  {
-    $local_listing_site_url = null;
-  }
-}
 
 $query = '
@@ -267 +168 @@
      );
      
-   if ($is_remote)
-   {
-     $tpl_var['remote'] =
-       array(
-         'U_TEST' => $base_url.'test',
-         'U_GENERATE' => $row['galleries_url'].'create_listing_file.php?action=generate',
-         'U_CLEAN' => $base_url.'clean',
-         );
-   }
-
   if ($row['id'] != 1)
   {
@@ -290 +181 @@
 
   $template->append('sites', $tpl_var);
-
-  if ( isset($local_listing_site_url) and
-       $row['galleries_url']==$local_listing_site_url )
-  {
-    $local_listing_site_id = $row['id'];
-    $template->assign( 'local_listing',
-        array(
-          'URL' =>  $local_listing_site_url,
-          'U_SYNCHRONIZE' => $update_url.'&local_listing=1'
-        )
-      );
-  }
 }
-
-if ( isset($local_listing_site_url) and !isset($local_listing_site_id) )
-{
-  $template->assign( 'local_listing',
-      array(
-        'URL' =>  $local_listing_site_url,
-        'CREATE' => true
-      )
-    );
-}
-
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'site_manager');

trunk/admin/site_update.php

@@ -59 +59 @@
     l10n('The name of directories and files must be composed of letters, numbers, "-", "_" or "."')
     ),
-  'PWG-UPDATE-2' => array(
-    l10n('missing thumbnail'),
-    l10n('a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :').implode(',', $conf['picture_ext'])
-    ),
   'PWG-ERROR-NO-FS' => array(
     l10n('File/directory read error'),
     l10n('The file or directory cannot be accessed (either it does not exist or the access is denied)')
     ),
-  'PWG-ERROR-VERSION' => array(
-    l10n('Piwigo version differs on the remote site'),
-    l10n('Version of create_listing_file.php on the remote site and Piwigo must be the same')
-    ),
-  'PWG-ERROR-NOLISTING' => array(
-    l10n('listing.xml file was not found'),
-    l10n('listing.xml file was not found on the remote site. This file is generated by choosing the "generate listing" command in the Site manager')
-    )
   );
 $errors = array();
@@ -82 +70 @@
 {
   fatal_error('remote sites not supported');
-  include_once(PHPWG_ROOT_PATH.'admin/site_reader_remote.php');
-  $local_listing = null;
-  if ( isset($_GET['local_listing'])
-      and $_GET['local_listing'] )
-  {
-    $local_listing = PHPWG_ROOT_PATH.'listing.xml';
-  }
-  $site_reader = new RemoteSiteReader($site_url, $local_listing);
 }
 else

trunk/admin/themes/default/template/site_manager.tpl

@@ -11 +11 @@
   </ul>
 </div>
-{/if}
-
-{if isset($local_listing)}
-{'A local listing.xml file has been found for'|@translate} {$local_listing.URL}
-{if isset($local_listing.CREATE)}
-<form action="{$F_ACTION}" method="post">
-  <p>
-    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-    {'Create this site'|@translate}:
-    <input type="hidden" name="no_check" value="1">
-    <input type="hidden" name="galleries_url" value="{$local_listing.URL}">
-    <input type="submit" name="submit" value="{'Submit'|@translate}">
-  </p>
-</form>
-{/if}
-{if isset($local_listing.U_SYNCHRONIZE)}
-&nbsp;<a href="{$local_listing.U_SYNCHRONIZE}" title="{'read local listing.xml and update'|@translate}">{'Synchronize'|@translate}</a>
-<br><br>
-{/if}
 {/if}
 
@@ -46 +27 @@
       [<a href="{$site.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|escape:'javascript'}');"
                 title="{'delete this site and all its attached elements'|@translate}">{'delete'|@translate}</a>]
-    {/if}
-    {if isset($site.remote)}
-      <br>
-      [<a href="{$site.remote.U_TEST}" title="{'test this remote site'|@translate}">{'test'|@translate}</a>]
-      [<a href="{$site.remote.U_GENERATE}" title="{'generate file listing.xml on remote site'|@translate}">{'generate listing'|@translate}</a>]
-      [<a href="{$site.remote.U_CLEAN}" title="{'remove remote listing.xml file'|@translate}">{'clean'|@translate}</a>]
     {/if}
     {if not empty($site.plugin_links)}

trunk/include/functions.inc.php

@@ -26 +26 @@
 include_once( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
-include_once( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_html.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_tag.inc.php' );

trunk/language/en_UK/admin.lang.php

@@ -86 +86 @@
 $lang[', click on'] = ", click on";
 $lang['... or '] = '... or ';
-$lang['A local listing.xml file has been found for'] = "A local listing.xml file has been found for";
 $lang['A new version of Piwigo is available.'] = "A new version of Piwigo is available.";
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = "a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :";
 $lang['Access type'] = "Access type";
 $lang['ACCESS_0'] = "Free access";
@@ -299 +297 @@
 $lang['Extensions Update'] = 'Extensions Update';
 $lang['Failed to write file to disk'] = 'Failed to write file to disk';
-$lang['file create_listing_file.php on remote site was not found'] = "file create_listing_file.php not found on the remote site";
 $lang['File upload stopped by extension'] = 'File upload stopped by extension';
 $lang['File'] = "File";
@@ -319 +316 @@
 $lang['GD version'] = "GD version";
 $lang['General statistics'] = "General statistics";
-$lang['generate file listing.xml on remote site'] = "generate file listing.xml on the remote site";
-$lang['generate listing'] = "generate listing";
 $lang['Get Support on Piwigo Forum'] = 'Get support on Piwigo forum';
 $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation';
@@ -405 +400 @@
 $lang['Link all album photos to some existing albums'] = "Link all album photos to some existing albums";
 $lang['Linked albums'] = "Linked albums";
-$lang['listing.xml file was not found on the remote site. This file is generated by choosing the "generate listing" command in the Site manager'] = "listing.xml file not found on the remote site. This file is generated with the \"generate listing\" command in the Site manager";
-$lang['listing.xml file was not found'] = "listing.xml file not found";
 $lang['Local'] = "Local";
 $lang['Lock albums'] = "Lock albums";
@@ -449 +442 @@
 $lang['Missing a temporary folder'] = 'Missing a temporary folder';
 $lang['Missing Plugins'] = 'Missing Plugins';
-$lang['missing thumbnail'] = "missing thumbnail";
 $lang['Modify information'] = "Modify information";
 $lang['Month'] = "Month";
@@ -542 +534 @@
 $lang['Piwigo Update'] = 'Piwigo Update';
 $lang['Piwigo Uploader'] = 'Piwigo Uploader';
-$lang['Piwigo version differs on the remote site'] = "Piwigo version differs on the remote site";
 $lang['Piwigo version'] = "Piwigo version";
 $lang['pixels'] = 'pixels';
@@ -578 +569 @@
 $lang['Rating by guests'] = "Rating by guests";
 $lang['Rating'] = "Rating";
-$lang['read local listing.xml and update'] = "read local listing.xml and update";
 $lang['Read Piwigo Documentation'] = 'Read Piwigo Documentation';
 $lang['reduce to single existing albums'] = "reduce to single existing albums";
@@ -594 +584 @@
 $lang['remove creation date'] = 'remove creation date';
 $lang['Remove from caddie'] = 'Remove from caddie';
-$lang['remove remote listing.xml file'] = "remove remote listing.xml file";
 $lang['remove tags'] = "remove tags";
 $lang['remove this filter'] = 'remove this filter';
@@ -779 +768 @@
 $lang['Validate'] = "Validate";
 $lang['Validation'] = "Validation";
-$lang['Version of create_listing_file.php on the remote site and Piwigo must be the same'] = "Versions of create_listing_file.php on the remote site and Piwigo must be the same";
 $lang['Version'] = "Version";
 $lang['Virtual album added'] = "Virtual album added";