Commit abde160f authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, trunk 21128 to 21215

parent abfcd27e
......@@ -23,7 +23,6 @@ css/freetags.css -text
css/ie6.css -text
css/ie8.css -text
css/jscalendar.css -text
css/spanky.css -text
db/.htaccess -text
db/case_patch.php -text
db/convertscripts/convert_pgsql.bat -text
......@@ -33,7 +32,6 @@ db/convertscripts/index.php -text
db/convertscripts/mysql_to_pgsql.php -text
db/convertscripts/mysql_to_sqlite.php -text
db/convertscripts/tikiversion.php -text
db/features.csv -text
db/fulltext.sql -text
db/index.php -text
db/tiki-4.0-mysql.sql -text
......@@ -466,10 +464,6 @@ img/flags/index.php -text
img/flags/readme.txt -text
img/flags/the_former_Yugoslav_Republic_of_Macedonia.gif -text
img/googleg.gif -text
img/gradient.png -text
img/gradient2.png -text
img/gradient3.png -text
img/gradient4.png -text
img/graph/graph.barstack.png -text
img/graph/graph.multibar.png -text
img/graph/graph.multiline.png -text
......@@ -989,6 +983,7 @@ img/icons2/world.gif -text
img/icons2/zweistern.gif -text
img/index.php -text
img/leftbar.gif -text
img/magnifying-glass-micro-icon.png -text
img/mainbar.gif -text
img/mytiki/admin.gif -text
img/mytiki/bookmarks.gif -text
......@@ -1482,8 +1477,6 @@ lib/Horde/Yaml/Loader.php -text
lib/Horde/Yaml/Node.php -text
lib/admin/adminlib.php -text
lib/admin/index.php -text
lib/admin/magic-enumerations.php -text
lib/admin/magiclib.php -text
lib/ajax/LICENSE.txt -text
lib/ajax/README.txt -text
lib/ajax/ajaxlib.php -text
......@@ -2684,6 +2677,7 @@ lib/wiki-plugins/wikiplugin_html.php -text
lib/wiki-plugins/wikiplugin_iframe.php -text
lib/wiki-plugins/wikiplugin_image.php -text
lib/wiki-plugins/wikiplugin_img.php -text
lib/wiki-plugins/wikiplugin_imgnew.php -text
lib/wiki-plugins/wikiplugin_include.php -text
lib/wiki-plugins/wikiplugin_invite.php -text
lib/wiki-plugins/wikiplugin_jabber.php -text
......@@ -4123,7 +4117,6 @@ tests/upgrade_categperm.php -text
/tiki-admin_actionlog.php -text
/tiki-admin_banners.php -text
/tiki-admin_banning.php -text
/tiki-admin_bar.php -text
/tiki-admin_calendars.php -text
/tiki-admin_categories.php -text
/tiki-admin_content_templates.php -text
......@@ -4131,7 +4124,6 @@ tests/upgrade_categperm.php -text
/tiki-admin_cookies.php -text
/tiki-admin_dsn.php -text
/tiki-admin_external_wikis.php -text
/tiki-admin_features.php -text
/tiki-admin_forums.php -text
/tiki-admin_hotwords.php -text
/tiki-admin_html_page_content.php -text
......@@ -4280,7 +4272,6 @@ tests/upgrade_categperm.php -text
/tiki-export_tracker.php -text
/tiki-export_wiki_pages.php -text
/tiki-faq_questions.php -text
/tiki-feature-load-postprocessor.php -text
/tiki-featured_link.php -text
/tiki-file_archives.php -text
/tiki-file_galleries_rankings.php -text
......@@ -4378,7 +4369,6 @@ tests/upgrade_categperm.php -text
/tiki-login_scr.php -text
/tiki-login_validate.php -text
/tiki-logout.php -text
/tiki-magic.php -text
/tiki-mailin-code.php -text
/tiki-mailin.php -text
/tiki-manage-workspaces.php -text
......
div#adminBar {
width:100%;
background: url("../img/gradient2.png");
background-color: #99CCDD;
font-size: 0.75em;
}
div#adminBar a {
text-decoration: none;
color: #666;
font-weight: normal;
}
div#adminBar ul.topLevelAdmin li {
/* 22/09/08 MatWho Quick hack, changed this to make it neat in Safari */
-moz-border-radius-topright: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px;
-webkit-border-top-left-radius: 5px;
}
ul.topLevelAdmin {
margin:0px;
/* 22/09/08 MatWho Quick hack, changed this to make it neat in Safari, the 1px padding makes it work ok in IE */
padding:1px 5px 0px 5px;
border-bottom:1px solid rgb(60,118,214);
}
ul.topLevelAdmin li {
display: inline;
list-style-type: none;
/* 22/09/08 MatWho Quick hack, changed this to make it neat in Safari */
padding:0px 8px 0px 8px;
}
ul.topLevelAdmin li.current {
/* background-color: #B5DAE6; */
background-color: rgb(170,211,226);
border:1px solid rgb(60,118,214);
border-bottom:1px solid rgb(170,211,226);
}
div#adminBar ul li.current a {
color: white;
}
ul.secondLevelAdmin {
margin:0px;
padding:5px;
background: url("../img/gradient4.png");
/* 22/09/08 MatWho Quick hack, commented this out to make 2nd bar legible in Safari
background-position-y: 20px; */
/* background-color: #B5DAE6; */
}
ul.secondLevelAdmin li {
display: inline;
list-style-type: none;
padding:5px;
}
ul.topLevelAdmin li.configureThis {
background: url("../img/gradient3.png");
}
ul.secondLevelAdmin li.special {
background: url("../img/gradient3.png");
}
#magicPanel label {
display:inline
}
.formLabel {
padding:3px;
}
.flag {
}
.featureLabel {
display:inline;
font-size: 0.8em;
font-weight: normal;
color: #bbb;
}
h4.feature {
float:left;
color:#fff;
padding:5px;
}
div.featureHeader {
background-color:#032936;
margin:0px 0px 10px 0px;
clear:both;
}
div.featureHeader a.goLink {
background-color: green;
color:#999;
font-weight: normal;
display: block;
float: right;
height: 100%;
}
h3.configSection {
padding:20px 3px 0px 3px;
width:30%;
text-align: left;
float:left;
clear:both;
}
tr h4 {
display:inline;
color:white;
}
.featureHeading.enabled td {background-color: #032936;}
.featureHeading.disabled td {background-color: #555;}
.subfeatureHeading.enabled td {background-color: #37555F;}
.subfeatureHeading.disabled td {background-color: #777;}
.configurationgroupHeading td {background-color: #37555F;}
.systemHeading td {background-color: #37555F;}
.containerHeading td {background-color: #37555F;}
tr.featureHeading td {vertical-align: middle; padding:5px;}
.enabled td.goLink {width:100px; background-color: #19422A; text-align: right; }
a.goLink {color:white; text-decoration: none;}
td.featureName {width:200px;}
td.featureEnabled {width:100px;}
td.useDefault {width:100px;}
td.featureHelp {width:100px;}
td.featureHelp a {text-decoration: none; color:white;}
tr > .tip {
border-top:1px solid #777;
border-bottom:1px solid #777;
background-color: #ccc;
padding:2px;
}
table.configTable {clear: both;}
table.configTable td {padding:3px;}
table.configTable tr.setting td {padding:3px 3px 10px 3px;}
div.configSetting {
clear:both;
}
#magicPanel hr {
clear:both;
}
#magicPanel .iconbar {
float:right;
}
#masterFeatureList li {color: #777;}
#masterFeatureList li.container, #masterFeatureList li.configurationgroup {color:black;}
#masterFeatureList li.feature {color:#77F;}
#masterFeatureList li.system {color:#7F7;}
#masterFeatureList li.functionality {color:#F77;}
sub {display:none;}
\ No newline at end of file
This diff is collapsed.
......@@ -6,6 +6,9 @@ if (strpos($_SERVER['SCRIPT_NAME'],basename(__FILE__)) !== false) {
exit;
}
// Set the host string for PDO dsn.
$db_hoststring = "host=$host_tiki";
switch ($db_tiki) {
case 'postgres7':
case 'postgres8':
......@@ -13,6 +16,14 @@ switch ($db_tiki) {
break;
case 'mysqli':
$db_tiki = 'mysql';
// If using mysql and it is set to use sockets instead of hostname,
// you can only use one method to connect, not both. If $socket_tiki
// is set in local.php, then it will override the hostname method
// of connecting to the database.
if (isset($socket_tiki)) {
$db_hoststring = "unix_socket=$socket_tiki";
}
break;
case 'oracle':
$db_tiki = 'oci';
......@@ -24,7 +35,8 @@ if ($db_tiki == 'sybase') {
}
try {
$dbTiki = new PDO("$db_tiki:host=$host_tiki;dbname=$dbs_tiki", $user_tiki, $pass_tiki);
//$dbTiki = new PDO("$db_tiki:host=$host_tiki;dbname=$dbs_tiki", $user_tiki, $pass_tiki);
$dbTiki = new PDO("$db_tiki:$db_hoststring;dbname=$dbs_tiki", $user_tiki, $pass_tiki);
$dbTiki->setAttribute(PDO::ATTR_CASE,PDO::CASE_NATURAL);
$dbTiki->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_WARNING);
$dbTiki->setAttribute(PDO::ATTR_ORACLE_NULLS,PDO::NULL_EMPTY_STRING);
......
......@@ -622,7 +622,7 @@ http://dev.tikiwiki.org/SocialContract
List of members of the Community
As of $now, the community has:
* $totalContributors members on Sourceforge,
* $totalContributors members on SourceForge.net,
* $nbCommiters of those people who made at least one code commit
This list is automatically generated and alphabetically sorted
......
......@@ -2846,7 +2846,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -7157,7 +7157,7 @@ $lang=Array(
"More Like This" => "Més com aquesta",
"Most popular tags" => "Marcadors més populars",
"List everything tagged" => "Llista tot el que estigui etiquetat",
"My prefered tags" => "Els meus marcadors preferits",
"My preferred tags" => "Els meus marcadors preferits",
"Google Search" => "Cerca en el Google",
"Last `\$module_rows` actions" => "Últimes `\$module_rows` accions",
"Last actions" => "Últimes accions",
......
......@@ -3925,7 +3925,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -1769,7 +1769,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "\$type" => "\$type",
// "insert original" => "insert original",
// "insert thumbnail" => "insert thumbnail",
......
......@@ -3229,7 +3229,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -4591,7 +4591,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Emulate Groups" => "Emulate Groups",
// "All Groups" => "All Groups",
// "Your Groups" => "Your Groups",
......
......@@ -2900,7 +2900,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -2964,7 +2964,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -2962,7 +2962,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -3407,7 +3407,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "\$type" => "\$type",
// "insert original" => "insert original",
// "insert thumbnail" => "insert thumbnail",
......
......@@ -3410,7 +3410,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "\$type" => "\$type",
// "insert original" => "insert original",
// "insert thumbnail" => "insert thumbnail",
......
......@@ -3579,7 +3579,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "\$type" => "\$type",
// "insert original" => "insert original",
// "insert thumbnail" => "insert thumbnail",
......
......@@ -2789,7 +2789,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -4941,7 +4941,7 @@ $lang=Array(
"Tags This Page Has" => "Tags associés à cette page",
"Add tags" => "Ajouter des tags",
"Most popular tags" => "Tags les plus populaires",
"My prefered tags" => "Mes Tags préférés",
"My preferred tags" => "Mes Tags préférés",
"Google Search" => "Rechercher avec Google",
"Last `\$module_rows` actions" => "Dernières `\$module_rows` actions",
"Last actions" => "Dernières actions",
......
......@@ -3285,7 +3285,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "\$type" => "\$type",
// "insert original" => "insert original",
// "insert thumbnail" => "insert thumbnail",
......
......@@ -3246,7 +3246,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -3337,7 +3337,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -2680,7 +2680,7 @@ $lang=Array(
// "Last `\$module_rows` forum topics" => "Last `\$module_rows` forum topics",
// "Folksonomy" => "Folksonomy",
// "Tags This Page Has" => "Tags This Page Has",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
// "Last `\$module_rows` blog posts" => "Last `\$module_rows` blog posts",
......
......@@ -3378,7 +3378,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -3205,7 +3205,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "\$type" => "\$type",
......
......@@ -2952,7 +2952,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -3208,7 +3208,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "\$type" => "\$type",
// "insert original" => "insert original",
// "insert thumbnail" => "insert thumbnail",
......
......@@ -3480,7 +3480,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -3254,7 +3254,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -6938,7 +6938,7 @@ $lang=Array(
"Most read topics" => "Tópicos mais lidos",
"Most visited forums" => "Fóruns mais visitados",
"Most popular tags" => "Palavras-chave mais populares",
"My prefered tags" => "Minhas palavras-chave preferidas",
"My preferred tags" => "Minhas palavras-chave preferidas",
"Google Search" => "Busca Google",
"Last `\$module_rows` actions" => "Últimas `\$module_rows` ações",
"Last actions" => "Últimas ações",
......
......@@ -3533,7 +3533,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "\$type" => "\$type",
......
......@@ -3346,7 +3346,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -3396,7 +3396,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -3268,7 +3268,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -1995,7 +1995,7 @@ $lang=Array(
"More Like This" => "Več takih",
"Most popular tags" => "Najbolj priljubljene značke",
"List everything tagged" => "Seznam vsega kar vsebuje značke",
"My prefered tags" => "Moje prednostne značke",
"My preferred tags" => "Moje prednostne značke",
"Google Search" => "Google iskanje",
"Last `\$module_rows` actions" => "Zadnji `\$module_rows` akcije",
"Last actions" => "Zadnje akcije",
......
......@@ -3342,7 +3342,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "\$type" => "\$type",
......
......@@ -2959,7 +2959,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -3469,7 +3469,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -2946,7 +2946,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Google Search" => "Google Search",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
......
......@@ -3429,7 +3429,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
......@@ -3321,7 +3321,7 @@ $lang=Array(
// "More Like This" => "More Like This",
// "Most popular tags" => "Most popular tags",
// "List everything tagged" => "List everything tagged",
// "My prefered tags" => "My prefered tags",
// "My preferred tags" => "My preferred tags",
// "Last `\$module_rows` actions" => "Last `\$module_rows` actions",
// "Last actions" => "Last actions",
// "Last `\$module_rows` articles" => "Last `\$module_rows` articles",
......
<?php
/*
* This is a set of enumerations which are used for populating drop down lists for the settings that require them.
*
* The array keys match the feature_type column of the settings that use it.
*/
$enumerations = array();
// since these are static, populate them each time. Maybe. There might be lots, soon...
$enumerations['commentordering'] = array('points_desc'=>'points', 'commentDate_desc'=>'newest', 'commentDate_asc'=>'oldest');
//get_strings('points_desc'=>tra('points'), 'commentDate_desc'=>tra('newest'), 'commentDate_asc'=>tra('oldest'));
$enumerations['alignment'] = array('left'=>'on left side', 'center'=>'on center', 'right'=>'on right side');
//get_strings('left'=>tra('on left side'), 'center'=>tra('on center'), 'right'=>tra('on right side'));
$enumerations['bloguser'] = array('disabled'=>'Disabled','text'=>'Plain text', 'link'=>'Link to user information', 'avatar'=>'User avatar');
//get_strings('disabled'=>tra('Disabled'),'text'=>tra('Plain text'), 'link'=>tra('Link to user information'), 'avatar'=>tra('User avatar'));
$enumerations['blogorder'] = array('created_desc'=>'Creation date (desc)', 'lastModif_desc'=>'Last modification date (desc)', 'title_asc'=>'Blog title (asc)', 'posts_desc'=>'Number of posts (desc)', 'hits_desc'=>'Visits (desc)','activity_desc'=>'Activity (desc)');
//get_strings('created_desc'=>tra('Creation date (desc)'), 'lastModif_desc'=>tra('Last modification date (desc)'), 'title_asc'=>tra('Blog title (asc)'), 'posts_desc'=>tra('Number of posts (desc)'), 'hits_desc'=>tra('Visits (desc)'),'activity_desc'=>tra('Activity (desc)'));
$enumerations['barlocation'] = array('top'=>'Top bar', 'bottom'=>'Bottom bar', 'both'=>'Both');
//get_strings('top'=>tra('Top bar'), 'bottom'=>tra('Bottom bar'), 'both'=>('Both'));
$enumerations['cachelength'] = array('0'=>'no cache', '60'=>'1 ' . 'minute', '300'=>'5 ' . 'minutes', '600'=>'10 ' . 'minutes', '900'=>'15 '. 'minutes', '1800'=>'30 ' . 'minutes', '3600'=>'1 ' . 'hour', '7200'=>'2 ' . 'hours');
//get_strings('0'=>tra('no cache'), '60'=>'1 ' . tra('minute'), '300'=>'5 ' . tra('minutes'), '600'=>'10 ' . tra('minutes'), '900'=>'15 '. tra('minutes'), '1800'=>'30 ' . tra('minutes'), '3600'=>'1 ' . tra('hour'), '7200'=>'2 ' . tra('hours'));
$enumerations['wikiauthor'] = array('classic'=>'as Creator &amp; Last Editor', 'business'=>'Business style', 'collaborative'=>'Collaborative style', 'lastmodif'=>'Page last modified on', 'none'=>'no (disabled)');
//get_strings('classic'=>tra('as Creator &amp; Last Editor'), 'business'=>tra('Business style'), 'collaborative'=>tra('Collaborative style'), 'lastmodif'=>tra('Page last modified on'), 'none'=>tra('no (disabled)'));
$enumerations['idletimeout'] = array(1=>1,2=>2,5=>5,10=>10,15=>15,30=>30);
//get_strings(1=>1,2=>2,5=>5,10=>10,15=>15,30=>30);
$enumerations['wikitablesyntax'] = array('old'=>'|| for rows','new'=>'<return> for rows');
//get_strings('old'=>tra('|| for rows'),'new'=>tra('<return> for rows'));
$enumerations['wikidiffs'] = array('old'=>'Only with last version', 'minsidediff'=>'Any 2 versions');
//get_strings('old'=>tra('Only with last version'), 'minsidediff'=>tra('Any 2 versions'));
$enumerations['wikilinkformat'] = array('complete'=>'complete', 'full'=>'latin', 'strict'=>'english');
//get_strings('complete'=>tra('complete'), 'full'=>tra('latin'), 'strict'=>tra('english'));
$enumerations['calendartimespan'] = array('1'=>'1 ' . 'minute', '5'=>'5 ' . 'minutes', '10'=>'10 ' . 'minutes', '15'=>'15 ' . 'minutes', '30'=>'30 ' . 'minutes');
//get_strings('1'=>'1 ' . tra('minute'), '5'=>'5 ' . tra('minutes'), '10'=>'10 ' . tra('minutes'), '15'=>'15 ' . tra('minutes'), '30'=>'30 ' . tra('minutes'));
$enumerations['calendarviewmode'] = array('day'=>'Day', 'week'=>'Week', 'month'=>'Month', 'quarter'=>'Quarter', 'semester'=>'Semester', 'year'=>'Year');
//get_strings('day'=>tra('Day'), 'week'=>tra('Week'), 'month'=>tra('Month'), 'quarter'=>tra('Quarter'), 'semester'=>tra('Semester'), 'year'=>tra('Year'));
$enumerations['firstdayofweek'] = array('6'=>'Saturday','0'=>'Sunday', '1'=>'Monday','user'=>'Depends user language');
//get_strings('6'=>tra('Saturday'),'0'=>tra('Sunday'), '1'=>tra('Monday'),'user'=>tra('Depends user language'));
$enumerations['errorreportinglevel'] = array ('0'=>'No error reporting','1'=>'Report all PHP errors','2'=>'Report all errors except notices');
//get_strings ('0'=>tra('No error reporting'),'1'=>tra('Report all PHP errors'),'2'=>tra('Report all errors except notices'));
$enumerations['forumordering'] = array ('created_asc'=>'Creation Date (asc)','created_desc'=>'Creation Date (desc)','threads_desc'=>'Topics (desc)','comments_desc'=>'Threads (desc)','lastPost_desc'=>'Last post (desc)','hits_desc'=>'Visits (desc)','name_desc'=>'Name (desc)','name_asc'=>'Name (asc)');
//get_strings ('created_asc'=>tra('Creation Date (asc)'),'created_desc'=>tra('Creation Date (desc)'),'threads_desc'=>tra('Topics (desc)'),'comments_desc'=>tra('Threads (desc)'),'lastPost_desc'=>tra('Last post (desc)'),'hits_desc'=>tra('Visits (desc)'),'name_desc'=>tra('Name (desc)'),'name_asc'=>tra('Name (asc)'));
$enumerations['userssortorder'] = array('score_asc'=>'Score ascending','score_desc'=>'Score descending','pref:realName_asc'=>'Name ascending','pref:realName_desc'=>'Name descending','login_asc'=>'Login ascending','login_desc'=>'Login descending');
//get_strings('score_asc'=>tra('Score ascending'),'score_desc'=>tra('Score descending'),'pref:realName_asc'=>tra('Name ascending'),'pref:realName_desc'=>tra('Name descending'),'login_asc'=>tra('Login ascending'),'login_desc'=>tra('Login descending'));
$enumerations['directorycolumns'] = array ('0'=>1,'1'=>2,'2'=>3,'3'=>4,'4'=>5,'5'=>6);
$enumerations['directoryopenlinks'] = array ('r'=>'replace current window','n'=>'new window','f'=>'inline frame');
//get_strings ('r'=>tra('replace current window'),'n'=>tra('new window'),'f'=>tra('inline frame'));