mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-10-16 21:12:29 +00:00
Merge branch 'seeddms-5.0.x' into develop
This commit is contained in:
Uwe Steinmann
commit
ddfea8f3cb
|
|
@ -472,7 +472,7 @@ class Settings { /* {{{ */
|
|||
$this->_dbDatabase = strval($tab["dbDatabase"]);
|
||||
$this->_dbUser = strval($tab["dbUser"]);
|
||||
$this->_dbPass = strval($tab["dbPass"]);
|
||||
$this->_doNotCheckDBVersion = Settings::boolVal($tab["doNotCheckVersion"]);
|
||||
$this->_doNotCheckDBVersion = Settings::boolVal($tab["doNotCheckDBVersion"]);
|
||||
|
||||
// XML Path: /configuration/system/smtp
|
||||
$node = $xml->xpath('/configuration/system/smtp');
|
||||
|
|
@ -790,7 +790,7 @@ class Settings { /* {{{ */
|
|||
$this->setXMLAttributValue($node, "dbDatabase", $this->_dbDatabase);
|
||||
$this->setXMLAttributValue($node, "dbUser", $this->_dbUser);
|
||||
$this->setXMLAttributValue($node, "dbPass", $this->_dbPass);
|
||||
$this->setXMLAttributValue($node, "doNotCheckVersion", $this->_doNotCheckVersion);
|
||||
$this->setXMLAttributValue($node, "doNotCheckVersion", $this->_doNotCheckDBVersion);
|
||||
|
||||
// XML Path: /configuration/system/smtp
|
||||
$node = $this->getXMLNode($xml, '/configuration/system', 'smtp');
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
//
|
||||
// Translators: Admin (570), ribaz (1019)
|
||||
// Translators: Admin (571), ribaz (1019)
|
||||
|
||||
$text = array(
|
||||
'accept' => 'Elfogad',
|
||||
|
|
@ -1236,7 +1236,7 @@ URL: [url]',
|
|||
'theme' => 'Téma',
|
||||
'thursday' => 'Csütörtök',
|
||||
'thursday_abbr' => 'Cs',
|
||||
'timeline' => '',
|
||||
'timeline' => 'Vremenska crta',
|
||||
'timeline_add_file' => '',
|
||||
'timeline_add_version' => '',
|
||||
'timeline_full_add_file' => '',
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
//
|
||||
// Translators: Admin (1500), s.pnt (26)
|
||||
// Translators: Admin (1502), s.pnt (26)
|
||||
|
||||
$text = array(
|
||||
'accept' => 'Accetta',
|
||||
|
|
@ -1273,7 +1273,7 @@ URL: [url]',
|
|||
'timeline_skip_status_change_1' => '',
|
||||
'timeline_skip_status_change_2' => '',
|
||||
'timeline_skip_status_change_3' => '',
|
||||
'timeline_status_change' => '',
|
||||
'timeline_status_change' => 'Versione - Stato',
|
||||
'to' => 'A',
|
||||
'toggle_manager' => 'Gestore',
|
||||
'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
|
||||
|
|
@ -1295,7 +1295,7 @@ URL: [url]',
|
|||
'transmittal_comment' => 'Commento',
|
||||
'transmittal_name' => 'Nome',
|
||||
'transmittal_size' => 'Dimensione',
|
||||
'tree_loading' => '',
|
||||
'tree_loading' => 'Caricamento directory in corso',
|
||||
'trigger_workflow' => 'Flusso di lavoro',
|
||||
'tr_TR' => 'Turco',
|
||||
'tuesday' => 'Martedì',
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
//
|
||||
// Translators: Admin (1097), tmichelfelder (106)
|
||||
// Translators: Admin (1098), tmichelfelder (106)
|
||||
|
||||
$text = array(
|
||||
'accept' => 'Godkänn',
|
||||
|
|
@ -1222,7 +1222,7 @@ URL: [url]',
|
|||
'theme' => 'Visningstema',
|
||||
'thursday' => 'torsdag',
|
||||
'thursday_abbr' => 'to',
|
||||
'timeline' => '',
|
||||
'timeline' => 'Tidslinje',
|
||||
'timeline_add_file' => '',
|
||||
'timeline_add_version' => '',
|
||||
'timeline_full_add_file' => '',
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// --------------- Suche starten --------------------------------------------
|
||||
|
||||
// Check to see if the search has been restricted to a particular
|
||||
|
|
@ -123,10 +122,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
|
|||
|
||||
if(strlen($query) < 4 && strpos($query, '*')) {
|
||||
$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
|
||||
$resArr = array();
|
||||
$resArr['totalDocs'] = 0;
|
||||
$resArr['totalFolders'] = 0;
|
||||
$resArr['totalPages'] = 0;
|
||||
$totalPages = 0;
|
||||
$entries = array();
|
||||
$searchTime = 0;
|
||||
} else {
|
||||
|
|
@ -136,26 +132,10 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
|
|||
$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categorynames);
|
||||
if($hits === false) {
|
||||
$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
|
||||
$resArr = array();
|
||||
$resArr['totalDocs'] = 0;
|
||||
$resArr['totalFolders'] = 0;
|
||||
$resArr['totalPages'] = 0;
|
||||
$totalPages = 0;
|
||||
$entries = array();
|
||||
$searchTime = 0;
|
||||
} else {
|
||||
$limit = 20;
|
||||
$resArr = array();
|
||||
$resArr['totalDocs'] = count($hits);
|
||||
$resArr['totalFolders'] = 0;
|
||||
if($pageNumber != 'all' && count($hits) > $limit) {
|
||||
$resArr['totalPages'] = (int) (count($hits) / $limit);
|
||||
if ((count($hits)%$limit) > 0)
|
||||
$resArr['totalPages']++;
|
||||
$hits = array_slice($hits, ($pageNumber-1)*$limit, $limit);
|
||||
} else {
|
||||
$resArr['totalPages'] = 1;
|
||||
}
|
||||
|
||||
$entries = array();
|
||||
$dcount = 0;
|
||||
$fcount = 0;
|
||||
|
|
@ -169,6 +149,16 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
|
|||
}
|
||||
}
|
||||
}
|
||||
$limit = 20;
|
||||
if($pageNumber != 'all' && count($entries) > $limit) {
|
||||
$totalPages = (int) (count($entries)/$limit);
|
||||
if(count($entries)%$limit)
|
||||
$totalPages++;
|
||||
if($limit > 0)
|
||||
$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
|
||||
} else {
|
||||
$totalPages = 1;
|
||||
}
|
||||
}
|
||||
$searchTime = getTime() - $startTime;
|
||||
$searchTime = round($searchTime, 2);
|
||||
|
|
|
|||
|
|
@ -425,9 +425,13 @@ $(document).ready( function() {
|
|||
var href = element.data('href');
|
||||
var view = element.data('view');
|
||||
var action = element.data('action');
|
||||
if(view && action)
|
||||
var query = element.data('query');
|
||||
if(view && action) {
|
||||
url = "out."+view+".php?action="+action;
|
||||
else
|
||||
if(query) {
|
||||
url += "&"+query;
|
||||
}
|
||||
} else
|
||||
url = href;
|
||||
// console.log('Calling '+url);
|
||||
$.get(url, function(data) {
|
||||
|
|
|
|||
|
|
@ -436,21 +436,6 @@ function showUser(selectObj) {
|
|||
id = selectObj.options[selectObj.selectedIndex].value;
|
||||
$('div.ajax').trigger('update', {userid: id});
|
||||
}
|
||||
|
||||
<?php if(0): ?>
|
||||
obj = -1;
|
||||
function showUser(selectObj) {
|
||||
if (obj != -1)
|
||||
obj.style.display = "none";
|
||||
|
||||
id = selectObj.options[selectObj.selectedIndex].value;
|
||||
if (id == -1)
|
||||
return;
|
||||
|
||||
obj = document.getElementById("keywords" + id);
|
||||
obj.style.display = "";
|
||||
}
|
||||
<?php endif; ?>
|
||||
</script>
|
||||
<?php
|
||||
$this->contentHeading(getMLText("user_management"));
|
||||
|
|
@ -474,26 +459,12 @@ function showUser(selectObj) {
|
|||
?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="ajax" data-view="UsrMgr" data-action="info"></div>
|
||||
<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
|
||||
</div>
|
||||
|
||||
<div class="span8">
|
||||
<div class="well">
|
||||
<div class="ajax" data-view="UsrMgr" data-action="form"></div>
|
||||
<?php if(0): ?>
|
||||
<div id="keywords0" style="display : none;">
|
||||
<?php $this->showUserForm(false); ?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
foreach ($users as $currUser) {
|
||||
print "<div id=\"keywords".$currUser->getID()."\" style=\"display : none;\">";
|
||||
$this->showUserForm($currUser);
|
||||
print "</div>\n";
|
||||
}
|
||||
endif;
|
||||
?>
|
||||
</div>
|
||||
<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user