merge r3054 from branch 2.0 to trunk

Code administration: convert all text files to Unix file format (CR as eol
and not CRLF)


git-svn-id: http://piwigo.org/svn/trunk@3055 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 30 insertions, 30 deletions

diff --git a/plugins/add_index/admin/main_page.php b/plugins/add_index/admin/main_page.php
index 78dd89602..06e1cf61d 100644
--- a/plugins/add_index/admin/main_page.php
+++ b/plugins/add_index/admin/main_page.php
@@ -20,15 +20,15 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-

-if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))

-{

-  die('Hacking attempt!');

-}

-
-// +-----------------------------------------------------------------------+

-// | include                                                               |

-// +-----------------------------------------------------------------------+

+
+if ((!defined('PHPWG_ROOT_PATH')) or (!(defined('IN_ADMIN') and IN_ADMIN)))
+{
+  die('Hacking attempt!');
+}
+
+// +-----------------------------------------------------------------------+
+// | include                                                               |
+// +-----------------------------------------------------------------------+
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
 
@@ -82,15 +82,15 @@ function get_add_index_directories($path, $recursive = true)
 
 // +-----------------------------------------------------------------------+
 // | Main                                                                  |
-// +-----------------------------------------------------------------------+

-// Compute values

+// +-----------------------------------------------------------------------+
+// Compute values
 $index_file_src=$conf['add_index_source_directory_path'].$conf['add_index_filename'];
 $overwrite_file=isset($_GET['overwrite']);
 $site_id = (isset($_GET['site_id']) and is_numeric($_GET['site_id']) 
             ? $_GET['site_id'] 
             : 0);
-

-// Init values

+
+// Init values
 $add_index_results = array();
 $count_copy = 0;
 $count_skip = 0;
@@ -145,9 +145,9 @@ order by
             $count_skip++;
           }
         }
-      }

-      else

-      {

+      }
+      else
+      {
         if (!empty($site_id))
         {
           array_push($page['errors'],
@@ -183,20 +183,20 @@ else
   array_push($page['errors'],
     sprintf(l10n('add_index_src_file_dont_exists'), $index_file_src));
 }
-

-// +-----------------------------------------------------------------------+

-// | template initialization                                               |

-// +-----------------------------------------------------------------------+

-$template->set_filenames(array('main_page' => dirname(__FILE__).'/main_page.tpl'));

-
-if (count($add_index_results) != 0)

-{

+
+// +-----------------------------------------------------------------------+
+// | template initialization                                               |
+// +-----------------------------------------------------------------------+
+$template->set_filenames(array('main_page' => dirname(__FILE__).'/main_page.tpl'));
+
+if (count($add_index_results) != 0)
+{
   $template->assign('add_index_results', $add_index_results);
-}

-

-// +-----------------------------------------------------------------------+

-// | Sending html code                                                     |

-// +-----------------------------------------------------------------------+

-$template->assign_var_from_handle( 'ADMIN_CONTENT', 'main_page');

+}
+
+// +-----------------------------------------------------------------------+
+// | Sending html code                                                     |
+// +-----------------------------------------------------------------------+
+$template->assign_var_from_handle( 'ADMIN_CONTENT', 'main_page');
 
 ?>
\ No newline at end of file