Changeset 767 for trunk/services

Timestamp:

Jun 7, 2022 6:41:24 AM (2 years ago)

Author:

anonymous

Message:

Add App param ‘template_ext’ used to inform services where to find header and footer templates. Minor fixes.

Location:

trunk/services

Files:

• admins.php (modified) (1 diff)
• lock.php (modified) (1 diff)
• login.php (modified) (1 diff)
• logs.php (modified) (2 diffs)
• password.php (modified) (1 diff)
• reset_password.php (modified) (1 diff)
• versions.php (modified) (1 diff)

trunk/services/admins.php

@@ -208 +208 @@
  *****************************************************************************/
 
-$nav->set('body_id', 'admins');
-
-include 'header.ihtml';
+$nav->set('id', 'admins');
+
+include 'header.' . $app->getParam('template_ext');
 $app->carryQuery($locally_carried_queries);
 include 'codebase/services/templates/' . $main_template;
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');
 
 /********************************************************************

trunk/services/lock.php

@@ -71 +71 @@
 
 // Templates.
-include 'header.ihtml';
+include 'header.' . $app->getParam('template_ext');
 // $lock->printErrorHTML();
 include 'lock.ihtml';
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');
 

trunk/services/login.php

@@ -70 +70 @@
         }
     } else {
-        $app->raiseMsg(_("Login failed, please try again."), MSG_NOTICE, __FILE__, __LINE__);
-        $app->logMsg(sprintf('User %s failed login (encrypted password: %s)', $frm['username'], $auth->encryptPassword($frm['password'])), LOG_NOTICE, __FILE__, __LINE__);
+        $app->raiseMsg(_("Log in failed, please try again."), MSG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('User %s failed log in (encrypted password: %s)', $frm['username'], $auth->encryptPassword($frm['password'])), LOG_NOTICE, __FILE__, __LINE__);
     }
 }
 
 // Titles and navigation header.
-$nav->add(_("Login"));
+$nav->add(_("Log in"));
 $nav->set('id', 'login');
 
 // Templates.
-include 'header.ihtml';
+include 'header.' . $app->getParam('template_ext');
 include 'login_form.ihtml';
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');
 

trunk/services/logs.php

@@ -148 +148 @@
 $page->calculate();
 
-include 'header.ihtml';
+include 'header.' . $app->getParam('template_ext');
 if ('output' == $main_template) {
     printLog($tmp_prefs->get('log_file'));
@@ -154 +154 @@
     include $main_template;
 }
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');
 
 

trunk/services/password.php

@@ -90 +90 @@
 
 // Templates.
-include 'header.ihtml';
+include 'header.' . $app->getParam('template_ext');
 include 'password.ihtml';
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');
 

trunk/services/reset_password.php

@@ -90 +90 @@
 $nav->set('id', 'reset_password');
 
-include 'header.ihtml';
+include 'header.' . $app->getParam('template_ext');
 include 'reset_password.ihtml';
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');
 

trunk/services/versions.php

@@ -142 +142 @@
  *****************************************************************************/
 
-include 'header.ihtml';
+include 'header.' . $app->getParam('template_ext');
 include 'codebase/services/templates/' . $main_template;
-include 'footer.ihtml';
+include 'footer.' . $app->getParam('template_ext');