Commit fda2991b authored by damosoft's avatar damosoft

Remember people its <br /> not <br/>

parent 8d85f535
......@@ -20,7 +20,7 @@ while(!feof($fp)) {
echo ".";
}
fclose($fp);
echo "<br/>\n";
echo "<br />\n";
// split into statements
......
<?php
/* $Header: /cvsroot/tikiwiki/tiki/db/convertscripts/mysql3topgsql72.php,v 1.15 2005-06-16 20:10:53 mose Exp $ */
/* $Header: /cvsroot/tikiwiki/tiki/db/convertscripts/mysql3topgsql72.php,v 1.16 2005-11-07 16:20:22 damosoft Exp $ */
$tikiversion='1.9';
if(!isset($_GET['version'])) {
......@@ -22,7 +22,7 @@ while(!feof($fp)) {
echo ".";
}
fclose($fp);
echo "<br/>\n";
echo "<br />\n";
// split into statements
......
......@@ -20,7 +20,7 @@ while(!feof($fp)) {
echo ".";
}
fclose($fp);
echo "<br/>\n";
echo "<br />\n";
// split into statements
......
......@@ -20,7 +20,7 @@ while(!feof($fp)) {
echo ".";
}
fclose($fp);
echo "<br/>\n";
echo "<br />\n";
// split into statements
......
......@@ -12,7 +12,7 @@ if (isset($_REQUEST['debug']) and $_REQUEST['debug'] == 'n')
$debug = 'n';
else {
$debug = 'y';
echo "Debug mode: to run the program give the parameter debug=n<br/>";
echo "Debug mode: to run the program give the parameter debug=n<br />";
}
if ($tiki_p_admin !="y") {
$smarty->assign('msg', tra("You do not have permission to use this feature"));
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/get_strings.php,v 1.44 2005-05-18 10:58:51 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/get_strings.php,v 1.45 2005-11-07 16:20:21 damosoft Exp $
// Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -170,7 +170,7 @@ if($tiki_p_admin != 'y') {
die("You need to be admin to run this script");
}
echo "Initialization time: ", $tiki_timer->elapsed(), " seconds<br/>\n";
echo "Initialization time: ", $tiki_timer->elapsed(), " seconds<br />\n";
$tiki_timer->start("files");
$comments = isset ($_REQUEST['comments']);
......@@ -228,7 +228,7 @@ if (!isset($_REQUEST["sort"]) || $_REQUEST["sort"] != 'n') {
echo "Sorting files...";
flush();
sort($files);
echo count($files), " items done.<br/>\nTiki directory parsed in: ", $tiki_timer->stop("files"), " seconds<br/>\n<br/>\n";
echo count($files), " items done.<br />\nTiki directory parsed in: ", $tiki_timer->stop("files"), " seconds<br />\n<br />\n";
flush();
}
$tiki_timer->start("processing");
......@@ -587,7 +587,7 @@ foreach ($languages as $sel) {
}
}
echo "Processing time: ", $tiki_timer->stop("processing"), " seconds<br/>\n";
echo "Total time spent: ", $tiki_timer->elapsed(), " seconds<br/>\n";
echo "Processing time: ", $tiki_timer->stop("processing"), " seconds<br />\n";
echo "Total time spent: ", $tiki_timer->elapsed(), " seconds<br />\n";
?>
......@@ -1528,7 +1528,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -393,7 +393,7 @@ $lang=Array(
"The cord" => "El fil",
"remove bookmark" => "elimina adreça d'interès",
"admin modules tpl" => "admin mòduls tpl",
"\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br/>\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n" => "\n<b>Nota 1</b>: si permeteu als usuaris configurar els mòduls, els mòduls\nassignats no es veurena a la pantalla fins que no els configureu\ndes de ElMeuTiki->mòdulss.<br/>\n<b>Nota 2</b>: Si assigneu mòduls a grups, assegureu-vos de tenir\ndesconnectada l'opció 'mostra sempre els mòduls a tots els grups'\nde Admin->General\n",
"\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br />\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n" => "\n<b>Nota 1</b>: si permeteu als usuaris configurar els mòduls, els mòduls\nassignats no es veurena a la pantalla fins que no els configureu\ndes de ElMeuTiki->mòdulss.<br />\n<b>Nota 2</b>: Si assigneu mòduls a grups, assegureu-vos de tenir\ndesconnectada l'opció 'mostra sempre els mòduls a tots els grups'\nde Admin->General\n",
"Control by Object" => "Control per Objecte",
"Received Pages" => "Pàgines Rebudes",
"messages tpl" => "missatges tpl",
......
......@@ -1251,7 +1251,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1120,7 +1120,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1380,7 +1380,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1756,7 +1756,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1746,7 +1746,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1412,7 +1412,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1128,7 +1128,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Group Attribute" => "LDAP Group Attribute",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
......
......@@ -926,7 +926,7 @@ $lang=Array(
// "choose a group ..." => "choose a group ...",
// "PEAR::Auth" => "PEAR::Auth",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1169,7 +1169,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -869,7 +869,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1309,7 +1309,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1749,7 +1749,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1065,7 +1065,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -822,7 +822,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
"choose a group ..." => "escolher um grupo ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -884,7 +884,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1200,7 +1200,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1605,7 +1605,7 @@ $lang=Array(
"right modules" => "olketa module long right module",
"edit/create" => "mekem senis/wakem",
"clear cache" => "kliarem cache",
"\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br/>\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n" => "\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br/>\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n",
"\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br />\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n" => "\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br />\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n",
"User Modules" => "Olketa Module blong User",
"Assign new module" => "Assignem new module",
"Edit this assigned module:" => "Mekem senis long disfala module:",
......
......@@ -1056,7 +1056,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -815,7 +815,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1749,7 +1749,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -984,7 +984,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "PAM" => "PAM",
// "PAM service" => "PAM service",
// "Currently unused" => "Currently unused",
......
......@@ -1698,7 +1698,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -1749,7 +1749,7 @@ $lang=Array(
// "Create user if not in Tiki?" => "Create user if not in Tiki?",
// "Create user if not in Auth?" => "Create user if not in Auth?",
// "Just use Tiki auth for admin?" => "Just use Tiki auth for admin?",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Host" => "LDAP Host",
// "LDAP Port" => "LDAP Port",
// "LDAP Scope" => "LDAP Scope",
......
......@@ -164,7 +164,7 @@ $lang=Array(
"URL (use \$page to be replaced by the page name in the URL example: http:www.example.com/tiki-index.php?page=\$page)" => "URL (вживайте \$page там, де потрібно замінити на назву сторінви в URL приклад: http:www.example.com/tiki-index.php?page=\$page)",
"Threads can be voted" => "Можна голосувати за низки",
"Directory (include trailing slash)" => "Теці (включаючи останню косу)",
"\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br/>\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n" => "\n<b>Примітка 1</b>: якщо ви дозволяєте своїм користувачам настроювати модулі, \nтоді назначені модулі не будуть показані на екрані до тих пір, \nпоки Ви не настроїте їх з MyTiki->modules.<br/>\n<b>Примітка 2</b>: Коли Ви назначаєте модулі для груп, пересвідчіться, \nщо Ви вимкнулу пукт 'display modules to all groups always'\nfrom Admin->General\n(показувати всі модулі всім групам з Адміністрація->Загальне)",
"\n<b>Note 1</b>: if you allow your users to configure modules then assigned\nmodules won't be reflected in the screen until you configure them\nfrom MyTiki->modules.<br />\n<b>Note 2</b>: If you assign modules to groups make sure that you\nhave turned off the option 'display modules to all groups always'\nfrom Admin->General\n" => "\n<b>Примітка 1</b>: якщо ви дозволяєте своїм користувачам настроювати модулі, \nтоді назначені модулі не будуть показані на екрані до тих пір, \nпоки Ви не настроїте їх з MyTiki->modules.<br />\n<b>Примітка 2</b>: Коли Ви назначаєте модулі для груп, пересвідчіться, \nщо Ви вимкнулу пукт 'display modules to all groups always'\nfrom Admin->General\n(показувати всі модулі всім групам з Адміністрація->Загальне)",
"Add all your site users to this newsletter (broadcast)" => "Додати всіх користувачів майданчка до цього листка новин (широкомовнення)",
"Add users" => "Додати користувачів",
"create new empty structure" => "створити нову порожню структ.",
......@@ -951,7 +951,7 @@ $lang=Array(
// "Highlight Group" => "Highlight Group",
// "choose a group ..." => "choose a group ...",
// "LDAP" => "LDAP",
// "LDAP URL<br/>(if set, this will override the Host and Port below)" => "LDAP URL<br/>(if set, this will override the Host and Port below)",
// "LDAP URL<br />(if set, this will override the Host and Port below)" => "LDAP URL<br />(if set, this will override the Host and Port below)",
// "LDAP Group DN" => "LDAP Group DN",
// "LDAP Group Attribute" => "LDAP Group Attribute",
// "LDAP Group OC" => "LDAP Group OC",
......
......@@ -94,7 +94,7 @@ class Base extends Observable {
if ( isset($db_table_prefix) && !is_null($db_table_prefix) && !empty($db_table_prefix) ) {
//printf("convert_query_table_prefixes():\$db_table_prefix = %s<br/>\n", $db_table_prefix );
//printf("convert_query_table_prefixes():\$db_table_prefix = %s<br />\n", $db_table_prefix );
if( isset($common_users_table_prefix) && !is_null($common_users_table_prefix) && !empty($common_users_table_prefix) ) {
$query = str_replace("`users_", "`".$common_users_table_prefix."users_", $query);
......@@ -107,7 +107,7 @@ class Base extends Observable {
$query = str_replace("`sessions", "`".$db_table_prefix."sessions", $query);
$query = str_replace("`galaxia_", "`".$db_table_prefix."galaxia_", $query);
//printf("convert_query_table_prefixes():\$query = %s<br/>\n", $query );
//printf("convert_query_table_prefixes():\$query = %s<br />\n", $query );
}
}
......
......@@ -27,7 +27,7 @@ class ArtLib extends TikiLib {
$parts = explode("...page...", $data);
$ret = $parts[$i - 1];
if (substr($parts[$i - 1], 1, 5) == "<br/>") $ret = substr($parts[$i - 1], 6);
if (substr($parts[$i - 1], 1, 5) == "<br />") $ret = substr($parts[$i - 1], 6);
if (substr($parts[$i - 1], 1, 6) == "<br />") $ret = substr($parts[$i - 1], 7);
return $ret;
......
......@@ -27,7 +27,7 @@ class BlogLib extends TikiLib {
$parts = explode("...page...", $data);
$ret = $parts[$i - 1];
if (substr($parts[$i - 1], 1, 5) == "<br/>") $ret = substr($parts[$i - 1], 6);
if (substr($parts[$i - 1], 1, 5) == "<br />") $ret = substr($parts[$i - 1], 6);
if (substr($parts[$i - 1], 1, 6) == "<br />") $ret = substr($parts[$i - 1], 7);
return $ret;
......
......@@ -1519,7 +1519,7 @@ $rss->image = $image;
$item = new FeedItem();
$item->title = "This is an the test title of an item";
$item->link = "http://localhost/item/";
$item->description = "<b>description in </b><br/>HTML";
$item->description = "<b>description in </b><br />HTML";
//optional
//item->descriptionTruncSize = 500;
......
......@@ -3302,7 +3302,7 @@ class HAW_image
HAW_specchar($this->alt, $deck), $localsrc);
// break instruction in WML
$br_command = "<br/>\n";
$br_command = "<br />\n";
}
// create required amount of carriage return's
......@@ -3476,7 +3476,7 @@ class HAW_table
elseif ($deck->ml == HAW_WML)
{
// make new line in WML
echo "</table><br/>\n";
echo "</table><br />\n";
}
}
};
......@@ -5081,7 +5081,7 @@ class HAW_submit
printf("<anchor>%s\n", HAW_specchar($this->label, $deck));
printf("<go href=\"%s%s%s\"/>\n", $url, $sep, $query_string);
echo "</anchor><br/>\n";
echo "</anchor><br />\n";
}
else
{
......@@ -5352,7 +5352,7 @@ class HAW_link
// create required amount of carriage return's
$br = "";
for ($i=0; $i < $this->br; $i++)
$br .= "<br/>";
$br .= "<br />";
printf("<a%s href=\"%s\">%s</a>%s\n",
$title_option, HAW_specchar($this->url, $deck),
......@@ -5530,7 +5530,7 @@ class HAW_phone
else
$title_option = "";
printf("<a%s href=\"wtai://wp/mc;%s\">%s</a><br/>\n", $title_option,
printf("<a%s href=\"wtai://wp/mc;%s\">%s</a><br />\n", $title_option,
ereg_replace("[+]", "%2B", $this->number), HAW_specchar($this->label, $deck));
}
elseif ($deck->ml == HAW_HDML)
......@@ -6051,7 +6051,7 @@ class HAW_rule
else
// WAP device does not understand <hr> tags
// ==> draw some number of hyphens to create a rule
echo "----------<br/>\n";
echo "----------<br />\n";
}
elseif ($deck->ml == HAW_HDML)
{
......
......@@ -156,9 +156,9 @@ class NotificationLib extends TikiLib {
$method = $res['method'];
global $$class;
include_once( $res['file'] );
if ($Debug) print $class . "=>" . $method ."<br/>";
if ($Debug) print $class . "=>" . $method ."<br />";
if ( is_callable(array(get_class($$class), $method)) ) {
if ($Debug) print $class . "=>" . $method . "<br/>";
if ($Debug) print $class . "=>" . $method . "<br />";
$continue = $$class->$method($raisedBy, $data);
}
}
......
......@@ -22,7 +22,7 @@ if (version_compare(phpversion(), '5.0') === -1 && !function_exists('clone')) {
}');
}
// $Id: Toc.php,v 1.1 2005-07-30 08:15:26 toggg Exp $
// $Id: Toc.php,v 1.2 2005-11-07 16:20:31 damosoft Exp $
class Text_Wiki_Render_Xhtml_Toc extends Text_Wiki_Render {
......@@ -83,12 +83,12 @@ class Text_Wiki_Render_Xhtml_Toc extends Text_Wiki_Render {
$start = strpos($this->wiki->source, $this->wiki->delim.$heading['start']['id'].$this->wiki->delim)
+ strlen($this->wiki->delim.$heading['start']['id'].$this->wiki->delim);
$end = strpos($this->wiki->source, $this->wiki->delim.$heading['end']['id'].$this->wiki->delim);
/*//echo htmlentities($this->wiki->source).'<br/><br/>';
echo $heading['start']['id'].' '.$heading['end']['id'].'<br/>';
echo $start.' '.$end.'<br/>';
echo substr($this->wiki->source, $start, 5).'<br/>';
echo substr($this->wiki->source, $end - 5, 5).'<br/>';
echo substr($this->wiki->source, $start, $end - $start).'<br/>';*/
/*//echo htmlentities($this->wiki->source).'<br /><br />';
echo $heading['start']['id'].' '.$heading['end']['id'].'<br />';
echo $start.' '.$end.'<br />';
echo substr($this->wiki->source, $start, 5).'<br />';
echo substr($this->wiki->source, $end - 5, 5).'<br />';
echo substr($this->wiki->source, $start, $end - $start).'<br />';*/
$text = substr($this->wiki->source, $start, $end - $start);
$wiki = clone($this->wiki);
......
......@@ -62,13 +62,13 @@ moz();
<xsl:attribute name="src"><xsl:value-of select="image/url"/></xsl:attribute>
<xsl:attribute name="alt"><xsl:value-of select="image/description"/></xsl:attribute>
<xsl:attribute name="title"><xsl:value-of select="image/title"/></xsl:attribute>
</img></a><br/>
</img></a><br />
</xsl:if>
<p />
<!-- ** kinrowan.end -->
Feed Title: <xsl:value-of select="title"/><br/>
Updated on: <xsl:value-of select="lastBuildDate"/><br/>
Feed Title: <xsl:value-of select="title"/><br />
Updated on: <xsl:value-of select="lastBuildDate"/><br />
<xsl:choose>
<xsl:when test="count(item) = 1">
There is only 1 post shown in this feed.
......@@ -135,12 +135,12 @@ To see the underlying XML tags please select the "View Source" command in your b
</td>
</tr>
</table>
<br/>
<br />
<div>
<xsl:attribute name="id">d_<xsl:value-of select="position()"/></xsl:attribute>
<xsl:value-of disable-output-escaping="yes" select="description"/>
</div><br/>
</div><br />
</td></tr>
</xsl:for-each>
......
......@@ -68,7 +68,7 @@ function smarty_modifier_userlink($other_user,$class='link',$idletime='not_set')
if ($feature_community_mouseover_name == 'y') {
$line .= $userlib->get_user_preference($other_user, "realName");
if ($line) {
$content .= $line."<br/>";
$content .= $line."<br />";
}
}
if ($feature_community_mouseover_friends == 'y' && $feature_friends == 'y') {
......@@ -78,36 +78,36 @@ function smarty_modifier_userlink($other_user,$class='link',$idletime='not_set')
if ($feature_community_mouseover_score == 'y') {
$content .= $star . $info['score'];
}
if ($feature_community_mouseover_score == 'y' || $feature_community_mouseover_friends == 'y') $content .= "<br/>";
if ($feature_community_mouseover_score == 'y' || $feature_community_mouseover_friends == 'y') $content .= "<br />";
if ($feature_community_mouseover_country == 'y') {
$country = $tikilib->get_user_preference($other_user, "country", "");
if ($country && $country != "Other") {
$content .= "<img src='img/flags/$country.gif' /> ".tra($country) . "<br/>";
$content .= "<img src='img/flags/$country.gif' /> ".tra($country) . "<br />";
}
}
if ($feature_community_mouseover_distance == 'y') {
$distance = $tikilib->get_userdistance($other_user,$user);
if (!is_null($distance)) {
$content .= $distance." ".tra("km") . "<br/>";
$content .= $distance." ".tra("km") . "<br />";
}
}
if($feature_community_mouseover_email == 'y') {
$email_isPublic = $tikilib->get_user_preference($other_user, "email is public");
if ($email_isPublic != 'n') {
include_once ('lib/userprefs/scrambleEmail.php');
$content .= scrambleEmail($info['email'], $email_isPublic) . "<br/>";
$content .= scrambleEmail($info['email'], $email_isPublic) . "<br />";
} elseif (!empty($friend)) {
$content .= $info['email'] . "<br/>";
$content .= $info['email'] . "<br />";
}
}
if ($feature_community_mouseover_lastlogin == 'y') {
$content .= tra("Last seen on ") . $tikilib->get_short_datetime($info['lastLogin']);
$content .= "<br/>";
$content .= "<br />";
}
if (is_numeric($idletime)) {
$content .= sprintf(tra("(idle for %s seconds)"), $idletime) . "<br/>";
$content .= sprintf(tra("(idle for %s seconds)"), $idletime) . "<br />";
}
if ($feature_community_mouseover_picture == 'y') {
......
......@@ -153,7 +153,7 @@ class TaskLib extends TikiLib {
foreach ($values as $key => $value) {
$entries[$key] = $value;
$count_values++;
//echo("$key: $value<br/>");
//echo("$key: $value<br />");
}
if ($entries['percentage'] == NULL){
......@@ -179,9 +179,9 @@ class TaskLib extends TikiLib {
$query_values.= "$comma ?";
$comma = ', ';
$count_entries++;
//echo("entries.$key: $value<br/>");
//echo("entries.$key: $value<br />");
}
//echo("$query<br/>");
//echo("$query<br />");
$query .= $query_values . ")";
$this->query($query,$entries);
}
......@@ -402,7 +402,7 @@ class TaskLib extends TikiLib {
$list_tasks_end = microtime();
$list_tasks_time = $list_tasks_end - $list_tasks_start;
//echo("list_task in $list_tasks_time seconds<br/>");
//echo("list_task in $list_tasks_time seconds<br />");
return $retval;
}
......
<?php
//
// $Header: /cvsroot/tikiwiki/tiki/lib/tikidblib-debug.php,v 1.13 2005-09-19 22:05:38 rabiddog Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/tikidblib-debug.php,v 1.14 2005-11-07 16:20:29 damosoft Exp $
//
......@@ -192,7 +192,7 @@ function getOne($query, $values = null, $reporterrors = true, $offset = 0) {
function sql_error($query, $values, $result) {
global $ADODB_LASTDB, $smarty;
trigger_error($ADODB_LASTDB . " error: " . $this->db->ErrorMsg(). " in query:<br/><pre>\n" . $query . "\n</pre><br/>", E_USER_WARNING);
trigger_error($ADODB_LASTDB . " error: " . $this->db->ErrorMsg(). " in query:<br /><pre>\n" . $query . "\n</pre><br />", E_USER_WARNING);
// only for debugging.
//trigger_error($ADODB_LASTDB . " error: " . $this->db->ErrorMsg(). " in query:<br />" . $query . "<br />", E_USER_WARNING);
$outp = "<div class='simplebox'><b>".tra("An error occured in a database query!")."</b></div>";
......@@ -274,7 +274,7 @@ function convert_query_table_prefixes(&$query) {
if ( isset($db_table_prefix) && !is_null($db_table_prefix) && !empty($db_table_prefix) ) {
//printf("convert_query_table_prefixes():\$db_table_prefix = %s<br/>\n", $db_table_prefix );
//printf("convert_query_table_prefixes():\$db_table_prefix = %s<br />\n", $db_table_prefix );
if( isset($common_users_table_prefix) && !is_null($common_users_table_prefix) && !empty($common_users_table_prefix) ) {
$query = str_replace("`users_", "`".$common_users_table_prefix."users_", $query);
......@@ -287,7 +287,7 @@ function convert_query_table_prefixes(&$query) {
$query = str_replace("`sessions", "`".$db_table_prefix."sessions", $query);
$query = str_replace("`galaxia_", "`".$db_table_prefix."galaxia_", $query);
//printf("convert_query_table_prefixes():\$query = %s<br/>\n", $query );
//printf("convert_query_table_prefixes():\$query = %s<br />\n", $query );
}
}
......
<?php
//
// $Header: /cvsroot/tikiwiki/tiki/lib/tikidblib.php,v 1.20 2005-09-19 21:22:31 michael_davey Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/tikidblib.php,v 1.21 2005-11-07 16:20:29 damosoft Exp $
//
// $access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__));
......@@ -151,7 +151,7 @@ function getOne($query, $values = null, $reporterrors = true, $offset = 0) {
function sql_error($query, $values, $result) {
global $ADODB_LASTDB, $smarty;
trigger_error($ADODB_LASTDB . " error: " . $this->db->ErrorMsg(). " in query:<br/><pre>\n" . $query . "\n</pre><br/>", E_USER_WARNING);
trigger_error($ADODB_LASTDB . " error: " . $this->db->ErrorMsg(). " in query:<br /><pre>\n" . $query . "\n</pre><br />", E_USER_WARNING);
// only for debugging.
//trigger_error($ADODB_LASTDB . " error: " . $this->db->ErrorMsg(). " in query:<br />" . $query . "<br />", E_USER_WARNING);
$outp = "<div class='simplebox'><b>".tra("An error occured in a database query!")."</b></div>";
......@@ -231,7 +231,7 @@ function convert_query_table_prefixes(&$query) {
if ( isset($db_table_prefix) && !is_null($db_table_prefix) && !empty($db_table_prefix) ) {
//printf("convert_query_table_prefixes():\$db_table_prefix = %s<br/>\n", $db_table_prefix );
//printf("convert_query_table_prefixes():\$db_table_prefix = %s<br />\n", $db_table_prefix );
if( isset($common_users_table_prefix) && !is_null($common_users_table_prefix) && !empty($common_users_table_prefix) ) {
$query = str_replace("`users_", "`".$common_users_table_prefix."users_", $query);
......@@ -244,7 +244,7 @@ function convert_query_table_prefixes(&$query) {
$query = str_replace("`sessions", "`".$db_table_prefix."sessions", $query);
$query = str_replace("`galaxia_", "`".$db_table_prefix."galaxia_", $query);
//printf("convert_query_table_prefixes():\$query = %s<br/>\n", $query );
//printf("convert_query_table_prefixes():\$query = %s<br />\n", $query );
}
}
......
......@@ -69,7 +69,7 @@ class WikiLib extends TikiLib {
$parts = explode($GLOBALS['PAGE_SEP'], $data);
$ret = $parts[$i - 1];
if (substr($parts[$i - 1], 1, 5) == "<br/>") $ret = substr($parts[$i - 1], 6);
if (substr($parts[$i - 1], 1, 5) == "<br />") $ret = substr($parts[$i - 1], 6);
if (substr($parts[$i - 1], 1, 6) == "<br />") $ret = substr($parts[$i - 1], 7);
return $ret;
......
......@@ -115,7 +115,7 @@
{if $tiki_p_admin_forum eq 'y'}
<a class="link" href="tiki-view_forum_thread.php?topics_offset={$smarty.request.topics_offset}&amp;topics_sort_mode={$smarty.request.topics_sort_mode}&amp;topics_find={$smarty.