move MiniTemplator and prototype to lib/

[tt-rss.git] / register.php

diff --git a/register.php b/register.php
index 891eaf994f2bfa382e1e1ef53c74792497740a27..15caf7d3838d1536e7c139574cb172dddfe4c9b2 100644 (file)
--- a/register.php
+++ b/register.php
@@ -59,8 +59,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="utility.css">
 <script type="text/javascript" src="functions.js"></script>
-<script type="text/javascript" src="prototype.js"></script>
-<script type="text/javascript" src="scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
+<script type="text/javascript" src="lib/prototype.js"></script>
+<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
 </head>
 
 <script type="text/javascript">
@@ -158,12 +158,6 @@
                }
 ?>
 
-<!-- If you have any rules or ToS you'd like to display, enter them here -->
-
-<?php  if (file_exists("templates/register_notice.txt")) {
-               require_once "templates/register_notice.txt";
-} ?>
-
 <?php if (REG_MAX_USERS > 0) {
                $result = db_query($link, "SELECT COUNT(*) AS cu FROM ttrss_users");
                $num_users = db_fetch_result($result, 0, "cu");
@@ -171,6 +165,12 @@
 
 <? if (!REG_MAX_USERS || $num_users < REG_MAX_USERS) { ?>
 
+       <!-- If you have any rules or ToS you'd like to display, enter them here -->
+
+       <?php   if (file_exists("templates/register_notice.txt")) {
+                       require_once "templates/register_notice.txt";
+       } ?>
+
        <? if (!$action) { ?>
        
        <p><?php echo __('Your temporary password will be sent to the specified email. Accounts, which were not logged in once, are erased automatically 24 hours after temporary password is sent.') ?></p> 
@@ -268,8 +268,8 @@
                        
                                        $mail = new PHPMailer();
                        
-                                       $mail->PluginDir = "phpmailer/";
-                                       $mail->SetLanguage("en", "phpmailer/language/");
+                                       $mail->PluginDir = "lib/phpmailer/";
+                                       $mail->SetLanguage("en", "lib/phpmailer/language/");
                        
                                        $mail->CharSet = "UTF-8";
                        
@@ -302,8 +302,8 @@
                        
                                        $mail = new PHPMailer();
                        
-                                       $mail->PluginDir = "phpmailer/";
-                                       $mail->SetLanguage("en", "phpmailer/language/");
+                                       $mail->PluginDir = "lib/phpmailer/";
+                                       $mail->SetLanguage("en", "lib/phpmailer/language/");
                        
                                        $mail->CharSet = "UTF-8";