Menu
▾
▴
sciret-svn — The subversion commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(58) |
Sep
(44) |
Oct
(7) |
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
(55) |
Sep
(48) |
Oct
(56) |
Nov
(14) |
Dec
|
|
From: <al...@us...> - 2008-09-16 16:18:53
|
Revision: 681
http://sciret.svn.sourceforge.net/sciret/?rev=681&view=rev
Author: alpeb
Date: 2008-09-16 23:18:51 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
added some loader images to the todo ops
Modified Paths:
--------------
trunk/javascript/general.js
trunk/templates/TodosDropdown.tpl
Modified: trunk/javascript/general.js
===================================================================
--- trunk/javascript/general.js 2008-09-16 23:09:03 UTC (rev 680)
+++ trunk/javascript/general.js 2008-09-16 23:18:51 UTC (rev 681)
@@ -537,10 +537,7 @@
},
showForm: function(todoId) {
- if (!todoId) {
- todoId = 0;
- }
-
+ showLoading("editTodoProgressImg_" + todoId);
YAHOO.util.Connect.asyncRequest('GET',
'index.php?view=EditTodo&id=' + todoId,
{
@@ -579,6 +576,8 @@
$('todoDialog').style.display = "block";
this.todoDialog.show();
+
+ successAjax("editTodoProgressImg_" + responseObj.argument);
},
showCalendar: function() {
Modified: trunk/templates/TodosDropdown.tpl
===================================================================
--- trunk/templates/TodosDropdown.tpl 2008-09-16 23:09:03 UTC (rev 680)
+++ trunk/templates/TodosDropdown.tpl 2008-09-16 23:18:51 UTC (rev 681)
@@ -33,6 +33,7 @@
<!-- BEGIN hasRelatedDraft_block -->
<img src="images/article_draft.png" />
<!-- END hasRelatedDraft_block -->
+ <img id="editTodoProgressImg_{todoId}" src="images/progress.gif" style="visibility:hidden" />
</li>
<!-- END todoItem_block -->
</ul>
@@ -41,5 +42,8 @@
<div class="headerLinks" style="text-align:center">[l]You have no To-Do's[/l]</div>
<!-- END noTodos_block -->
- <p class="add"><span class="button_green"><a href="javascript:void(0)" onclick="SCIRET.todos.showForm()">[l]Add new[/l]</a></span></p>
+ <p class="add">
+ <span class="button_green"><a href="javascript:void(0)" onclick="SCIRET.todos.showForm(0)">[l]Add new[/l]</a></span>
+ <img id="editTodoProgressImg_0" src="images/progress.gif" style="visibility:hidden" />
+ </p>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-16 16:09:06
|
Revision: 680
http://sciret.svn.sourceforge.net/sciret/?rev=680&view=rev
Author: alpeb
Date: 2008-09-16 23:09:03 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
fixed little jump when popping-up the todo popup
Modified Paths:
--------------
trunk/javascript/general.js
trunk/templates/head.tpl
Modified: trunk/javascript/general.js
===================================================================
--- trunk/javascript/general.js 2008-09-16 22:58:24 UTC (rev 679)
+++ trunk/javascript/general.js 2008-09-16 23:09:03 UTC (rev 680)
@@ -575,6 +575,9 @@
this.todoDialog.callback.success = SCIRET.todos.saveCompleted;
this.todoDialog.callback.scope = this;
this.todoDialog.render();
+
+ $('todoDialog').style.display = "block";
+
this.todoDialog.show();
},
Modified: trunk/templates/head.tpl
===================================================================
--- trunk/templates/head.tpl 2008-09-16 22:58:24 UTC (rev 679)
+++ trunk/templates/head.tpl 2008-09-16 23:09:03 UTC (rev 680)
@@ -48,4 +48,4 @@
// var myLogReader = new YAHOO.widget.LogReader();
</script>
<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
- <div id="todoDialog"></div>
+ <div id="todoDialog" style="display:none"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-16 15:58:29
|
Revision: 679
http://sciret.svn.sourceforge.net/sciret/?rev=679&view=rev
Author: alpeb
Date: 2008-09-16 22:58:24 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
refactored todo popup
Modified Paths:
--------------
trunk/actions/CompleteTodo.php
trunk/actions/DeleteTodo.php
trunk/actions/SaveTodo.php
trunk/javascript/general.js
trunk/style.css
trunk/templates/EditTodo.tpl
trunk/templates/TodosDropdown.tpl
trunk/templates/footer.tpl
trunk/templates/head.tpl
trunk/views/EditTodo.php
Modified: trunk/actions/CompleteTodo.php
===================================================================
--- trunk/actions/CompleteTodo.php 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/actions/CompleteTodo.php 2008-09-16 22:58:24 UTC (rev 679)
@@ -16,15 +16,16 @@
function dispatch() {
$todo = new Todo($_POST['todoId']);
+ $jsonObj = new StdClass();
if ($todo->getUserId() != $this->user->id) {
- echo 'FAILURE|' . $this->user->lang('Cannot complete other people\'s todo\'s');
+ $jsonObj->message = $this->user->lang('Cannot complete other people\'s todo\'s');
exit;
+ } else {
+ $todo->setStatus(TODO_STATUS_COMPLETED);
+ $todo->save();
}
- $todo->setStatus(TODO_STATUS_COMPLETED);
- $todo->save();
-
- echo 'OK|OK';
+ echo Zend_Json::encode($jsonObj);
}
}
Modified: trunk/actions/DeleteTodo.php
===================================================================
--- trunk/actions/DeleteTodo.php 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/actions/DeleteTodo.php 2008-09-16 22:58:24 UTC (rev 679)
@@ -16,11 +16,13 @@
function dispatch() {
$todoGateway = new TodoGateway;
+ $jsonObj = new StdClass();
if ($todoGateway->deleteTodo($_POST['todoId'], $this->user->id)) {
- echo 'OK';
+ $jsonObj->message = $this->user->lang('To-Do deleted successfuly');
} else {
- echo 'FAILURE';
+ $jsonObj->message = $this->user->lang('There was a problem trying to delete this To-Do');
}
+ echo Zend_Json::encode($jsonObj);
}
}
Modified: trunk/actions/SaveTodo.php
===================================================================
--- trunk/actions/SaveTodo.php 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/actions/SaveTodo.php 2008-09-16 22:58:24 UTC (rev 679)
@@ -36,11 +36,11 @@
}
$todo->save();
- Library::redirect(Library::getLink(array( 'view' => 'EditTodo',
- 'id' => $todo->getId(),
- 'message' => urlencode($this->user->lang('To-do saved successfully')),
- )
- ));
+ $jsonObj = new StdClass();
+ $jsonObj->todoId = $todo->getId();
+ $jsonObj->message = $this->user->lang('To-do saved successfully');
+
+ echo Zend_Json::encode($jsonObj);
}
}
Modified: trunk/javascript/general.js
===================================================================
--- trunk/javascript/general.js 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/javascript/general.js 2008-09-16 22:58:24 UTC (rev 679)
@@ -23,6 +23,45 @@
// to avoid conflicts with YAHOO.tools' $ function
var $j = jQuery.noConflict();
+SCIRET.debugWindow = function() {
+ var popup = false;
+
+ return {
+ log: function (str) {
+ if (!popup) {
+ popup = window.open('', 'debugging', 'width=400, height=500, scrollbars=yes, resizable=yes');
+ popup.document.write('<pre>\n');
+ }
+ popup.document.write(str + '\n');
+ }
+ }
+}();
+
+SCIRET.utils = function() {
+ return {
+ isSafari: (document.childNodes && !document.all && !navigator.taintEnabled && !navigator.accentColorName)? true : false,
+
+ isKhtml: /Konqueror|Safari|KHTML/i.test(navigator.userAgent),
+
+ isIE: (document.all)? true : false,
+
+ isIE5: ( this.is_ie && /msie 5\.0/i.test(navigator.userAgent) )? true : false,
+
+ evalScripts: function (el) {
+ el = (typeof el =="string")? $(el) : el;
+ var scripts = el.getElementsByTagName("script");
+ for(var i=0; i < scripts.length;i++) {
+ eval(scripts[i].innerHTML);
+ }
+ },
+
+ replaceContent: function(responseObj, elId) {
+ $(elId).innerHTML = responseObj.responseText;
+ SCIRET.utils.evalScripts(elId);
+ }
+ };
+}();
+
// *********************************************************
// ** BROWSER DETECTION **
// *********************************************************
@@ -35,15 +74,12 @@
isIE7 = false;
}
-isSafari = (document.childNodes && !document.all && !navigator.taintEnabled && !navigator.accentColorName)? true : false;
-
var onloadFunctions = new Array();
// *********************************************************
// ** STATE VARIABLES **
// *********************************************************
var isFavoritesDropdownShown = false;
-var isTodosDropdownShown = false;
function triggerOnloadFunctions() {
for (var i = 0; i < onloadFunctions.length; i++) {
@@ -276,24 +312,74 @@
// *********************************************************
// ** CALENDAR FUNCTIONS **
// *********************************************************
-function dateSelected(calendar, date) {
- var input_field = $("hiddenDate");
- input_field.value = date;
- if (calendar.dateClicked) {
- $('dateShow').innerHTML = calendar.date.print(calendar.params.daFormat);
- calendar.callCloseHandler();
- $('labelSetDate').style.display = 'none';
- $('removeDateLink').style.display = '';
- }
+function dateSelected(type, args, cal) {
+ var dates = args[0];
+ var date = dates[0];
+ var year = date[0], month = date[1], day = date[2];
+ $("todoHiddenDate").value = year + "-" + month + "-" + day;
+ $('todoDateShow').innerHTML = formatDate(SCIRET.todos.dateFormat, month, day, year);
+ cal.hide();
+ $('todoLabelSetDate').style.display = 'none';
+ $('todoRemoveDateLink').style.display = '';
}
function removeDate() {
- $('hiddenDate').value = '';
- $('dateShow').innerHTML = '';
- $('labelSetDate').style.display = '';
- $('removeDateLink').style.display = 'none';
+ $('todoHiddenDate').value = '';
+ $('todoDateShow').innerHTML = '';
+ $('todoLabelSetDate').style.display = '';
+ $('todoRemoveDateLink').style.display = 'none';
}
+/**
+ * Based on a function from The DHTML Calendar,
+ * Copyright Mihai Bazon, 2002-2005 | www.bazon.net/mishoo
+/* Prints the date in a string according to the given format.
+*/
+function formatDate(str, m, d, y) {
+ var _MN = new Array
+ ("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+ var ar = new Array();
+ for (var i = 12; i > 0;) {
+ ar[--i] = _MN[i].substr(0, 3);
+ }
+
+ var s = {};
+ s["%b"] = ar[m]; // abbreviated month name [FIXME: I18N]
+ s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+ s["%e"] = d; // the day of the month (range 1 to 31)
+ s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+ s["%Y"] = y; // year with the century
+ s["%%"] = "%"; // a literal '%' character
+
+ var re = /%./g;
+ if (!SCIRET.utils.isIE5 && !SCIRET.utils.isKhtml) {
+ return str.replace(re, function (par) { return s[par] || par; });
+ }
+
+ var a = str.match(re);
+ for (var i = 0; i < a.length; i++) {
+ var tmp = s[a[i]];
+ if (tmp) {
+ re = new RegExp(a[i], 'g');
+ str = str.replace(re, tmp);
+ }
+ }
+
+ return str;
+};
+
// *********************************************************
// ** Favorites FUNCTIONS **
// *********************************************************
@@ -307,8 +393,8 @@
return;
}
- if (isTodosDropdownShown) {
- isTodosDropdownShown = false;
+ if (SCIRET.todos.isTodosDropdownShown) {
+ SCIRET.todos.setIsTodosDropdownShown(false);
$('todosDropdown').style.display = 'none';
}
@@ -331,7 +417,7 @@
var favoritesDropdown = YAHOO.util.Dom.get('favoritesDropdown');
favoritesDropdown.innerHTML = responseObj.responseText;
- if (isSafari) {
+ if (SCIRET.utils.isSafari) {
favoritesDropdown.style.paddingBottom = '25px';
}
new YAHOO.widget.Effects.BlindDown('favoritesDropdown');
@@ -394,82 +480,203 @@
// *********************************************************
// ** TODOS FUNCTIONS **
// *********************************************************
-function dropdownTodos() {
- if (isTodosDropdownShown) {
- isTodosDropdownShown = false;
- $('todosDropdown').style.display = 'none';
- if (isIE && !isIE7) {
- _showSelects();
- }
- return;
- }
+SCIRET.todos = function() {
- if (isFavoritesDropdownShown) {
- isFavoritesDropdownShown = false;
- $('favoritesDropdown').style.display = 'none';
- }
+ return {
+ isTodosDropdownShown: false,
- showLoading('todosLoading');
- var transaction = YAHOO.util.Connect.asyncRequest('GET',
- 'index.php?view=GetTodosDropdown',
- {
- success: showDropDownTodos,
- failure: function() {alert('operation failed')}
- },
- null);
-}
+ todoDialog: null,
-function showDropDownTodos(responseObj) {
- successAjax('todosLoading')
- if (isIE && !isIE7) {
- _hideSelects();
- }
+ cal: null,
- var todosDropdown = YAHOO.util.Dom.get('todosDropdown');
- todosDropdown.innerHTML = responseObj.responseText;
- if (isSafari) {
- todosDropdown.style.paddingBottom = '25px';
- }
- new YAHOO.widget.Effects.BlindDown('todosDropdown');
+ dateFormat: null,
- isTodosDropdownShown = true;
-}
+ setIsTodosDropdownShow: function (is) {
+ isTodosDropdownShown = is;
+ },
-function showEditTodoForm(todoId) {
- if (!todoId) {
- todoId = 0;
- }
+ dropdown: function() {
+ if (this.isTodosDropdownShown) {
+ this.isTodosDropdownShown = false;
+ $('todosDropdown').style.display = 'none';
+ if (isIE && !isIE7) {
+ _showSelects();
+ }
+ return;
+ }
- openSimDialog('index.php?view=EditTodo&id=' + todoId, 310, 360);
-}
+ if (isFavoritesDropdownShown) {
+ isFavoritesDropdownShown = false;
+ $('favoritesDropdown').style.display = 'none';
+ }
-function tickTodo(todoId) {
- if (!confirm('Are you sure you wish to mark this TO-DO as completed?')) {
- $('todoCheck_' + todoId).checked = false;
- return;
- }
- $('todoCheck_' + todoId).style.display = 'none';
- $('todoProgressImg_' + todoId).style.display = 'inline';
+ showLoading('todosLoading');
+ YAHOO.util.Connect.asyncRequest('GET',
+ 'index.php?view=GetTodosDropdown',
+ {
+ success: this.showDropDownTodos,
+ failure: function() {alert('operation failed')}
+ },
+ null);
+ },
- var transaction = YAHOO.util.Connect.asyncRequest('POST',
- 'index.php?action=CompleteTodo',
- {
- success: function (response) {successAjax('todoProgressImg_' + todoId), completeTickTodo(response, todoId)},
- failure: function() {alert('operation failed')}
- },
- 'todoId=' + todoId);
-}
+ showDropDownTodos: function(responseObj) {
+ successAjax('todosLoading')
+ if (isIE && !isIE7) {
+ _hideSelects();
+ }
-function completeTickTodo(responseObj, todoId) {
- var responseArr = responseObj.responseText.split('|');
- if (responseArr[0] != 'OK') {
- alert('There was a problem trying to complete this TO-DO');
- return;
- }
+ var todosDropdown = YAHOO.util.Dom.get('todosDropdown');
+ todosDropdown.innerHTML = responseObj.responseText;
+ if (SCIRET.utils.isSafari) {
+ todosDropdown.style.paddingBottom = '25px';
+ }
+ new YAHOO.widget.Effects.BlindDown('todosDropdown');
- $('todoLink_' + todoId).style.textDecoration = 'line-through';
-}
+ this.isTodosDropdownShown = true;
+ },
+ showForm: function(todoId) {
+ if (!todoId) {
+ todoId = 0;
+ }
+
+ YAHOO.util.Connect.asyncRequest('GET',
+ 'index.php?view=EditTodo&id=' + todoId,
+ {
+ success: this.showEditTodoForm2,
+ argument: [todoId],
+ failure: function() {alert('operation failed')},
+ scope: this
+ },
+ null);
+ },
+
+ showEditTodoForm2: function(responseObj) {
+ SCIRET.utils.replaceContent(responseObj, 'todoDialog');
+
+ YAHOO.util.Event.onDOMReady(function() {
+ YAHOO.util.Event.addListener($("dueDateButton"),
+ "click",
+ SCIRET.todos.showCalendar);
+ });
+
+ var buttons = [{text: "Save", handler: this.save}];
+ if (responseObj.argument > 0) {
+ buttons.push({text: "Delete", handler: function() {SCIRET.todos.delete(responseObj.argument)}});
+ }
+ buttons.push({text: "Cancel", handler: function() {this.cancel()}});
+
+ this.todoDialog = new YAHOO.widget.Dialog("todoDialog",
+ {
+ fixedcenter: true,
+ buttons: buttons
+ });
+ this.todoDialog.callback.success = SCIRET.todos.saveCompleted;
+ this.todoDialog.callback.scope = this;
+ this.todoDialog.render();
+ this.todoDialog.show();
+ },
+
+ showCalendar: function() {
+ this.cal = new YAHOO.widget.Calendar("todoCalContainer", {
+ close: true
+ });
+ this.cal.selectEvent.subscribe(dateSelected, this.cal, true);
+ this.cal.render();
+ this.cal.show();
+ },
+
+ // the scope here is the dialog instance
+ save: function() {
+ $('todoProgressImg').style.display = 'inline';
+
+ $('todosDropdown').style.display = 'none';
+ SCIRET.todos.isTodosDropdownShown = false;
+
+ this.submit();
+ },
+
+ saveCompleted: function(responseObj) {
+ try {
+ var response = YAHOO.lang.JSON.parse(responseObj.responseText);
+ } catch (e) {
+ alert("Operation failed. Here's the result returned:\n\n" + responseObj.responseText);
+ return;
+ }
+ alert(response.message);
+
+ this.showForm(response.todoId);
+ },
+
+ delete: function(todoId) {
+ if (!confirm("Are you sure you wish to delete this To-Do?")) {
+ return;
+ }
+
+ showLoading('todoProgressImg');
+ YAHOO.util.Connect.asyncRequest('POST',
+ 'index.php?action=DeleteTodo',
+ {
+ success: this.deleteCompleted,
+ failure: function() {alert('operation failed')}
+ },
+ 'todoId='+todoId);
+ },
+
+ deleteCompleted: function(responseObj) {
+ successAjax('todoProgressImg');
+
+ try {
+ var response = YAHOO.lang.JSON.parse(responseObj.responseText);
+ } catch (e) {
+ alert("Operation failed. Here's the result returned:\n\n" + responseObj.responseText);
+ return;
+ }
+ alert(response.message);
+ $('todosDropdown').style.display = 'none';
+ SCIRET.todos.isTodosDropdownShown = false;
+
+ SCIRET.todos.todoDialog.cancel();
+ },
+
+ tick: function(todoId) {
+ if (!confirm('Are you sure you wish to mark this TO-DO as completed?')) {
+ $('todoCheck_' + todoId).checked = false;
+ return;
+ }
+ $('todoCheck_' + todoId).style.display = 'none';
+ $('todoProgressImg_' + todoId).style.display = 'inline';
+
+ YAHOO.util.Connect.asyncRequest('POST',
+ 'index.php?action=CompleteTodo',
+ {
+ success: function (response) {SCIRET.todos.completeTick(response, todoId)},
+ failure: function() {alert('operation failed')}
+ },
+ 'todoId=' + todoId);
+ },
+
+ completeTick: function(responseObj, todoId) {
+ successAjax('todoProgressImg_' + todoId);
+
+ try {
+ var response = YAHOO.lang.JSON.parse(responseObj.responseText);
+ } catch (e) {
+ alert("Operation failed. Here's the result returned:\n\n" + responseObj.responseText);
+ return;
+ }
+
+ if (typeof response.message != 'undefined') {
+ alert(response.message);
+ return;
+ }
+
+ $('todoLink_' + todoId).style.textDecoration = 'line-through';
+ }
+ };
+}();
+
// *********************************************************
// ** HELPER FUNCTIONS **
// *********************************************************
Modified: trunk/style.css
===================================================================
--- trunk/style.css 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/style.css 2008-09-16 22:58:24 UTC (rev 679)
@@ -200,6 +200,8 @@
background: url(images/bg_content.jpg) repeat-y;
}
+.clear { clear:both; }
+
/* ########################## */
/* MENU */
/* ########################## */
Modified: trunk/templates/EditTodo.tpl
===================================================================
--- trunk/templates/EditTodo.tpl 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/templates/EditTodo.tpl 2008-09-16 22:58:24 UTC (rev 679)
@@ -8,121 +8,44 @@
* @packager Keyboard Monkeys
*/
-->
+<div class="hd">
+ {formTitle}
+ <img id="todoProgressImg" src="images/progress.gif" style="display:none" />
+</div>
+<div class="bd">
+ <script>
+ SCIRET.todos.dateFormat = "{jsCalDateFormat}";
+ </script>
+ <form action="{formAction}" method="POST">
+ <div id="relatedArtsMessage">{message}</div>
+ <input type="hidden" name="todoId" value="{todo_id}" />
-<script type="text/javascript">
-function saveTodo(form) {
- $('todoProgressImg').style.display = 'inline';
+ <label for="title">[l]Title[/l]</label>
+ <input type="text" name="title" value="{title}" />
+ <div class="clear"></div>
- opener.isTodosDropdownShown = false;
- opener.$('todosDropdown').style.display = 'none';
+ <label for="content">[l]Contents[/l]</label>
+ <textarea id="content" name="content" style="width:170px; height:100px">{content}</textarea>
+ <div class="clear"></div>
- form.submit();
-}
+ <label for="dueDate">[l]Due Date[/l]</label>
+ <input type="hidden" id="todoHiddenDate" name="dueDate" value="{dueDate}" />
+ <span id="todoDateShow">{dueDateContents}</span>
+ <img src="images/datepopup.gif" id="dueDateButton" style="cursor:pointer" />
+ <div id="todoCalContainer" style="display:none; position:absolute; left:10px; z-index:1"></div>
+ <span id="todoLabelSetDate" style="display:{labelSetDueDateDisplay}; font: normal 12px sans-serif">([l]Currently none.<br />Click icon to set one.[/l])</span><br />
+ <a id="todoRemoveDateLink" href="javascript:void(0);" onclick="removeDate();" style="display:{removeDueDateLinkDisplay};">[l]Remove due date[/l]</a>
+ <div class="clear"></div>
-function deleteTodo() {
- new Ajax.Request(
- 'index.php?action=DeleteTodo',
- {
- method : 'post',
- parameters : 'todoId=' + {todo_id},
- onLoading : function() {showLoading('todoProgressImg');},
- onComplete : deleteTodoCompleted
- }
- );
-}
+ <label for="private">[l]Private[/l]</label>
+ <input type="checkbox" id="private" name="private" {privateChecked}/>
+ <div class="clear"></div>
-function deleteTodoCompleted(responseObj) {
- successAjax('todoProgressImg');
-
- if (responseObj.responseText == 'OK') {
- opener.isTodosDropdownShown = false;
- opener.$('todosDropdown').style.display = 'none';
-
- alert('To-Do deleted successfuly');
- setTimeout("window.close();", 100);
- } else {
- alert('There was a problem trying to delete this To-Do');
- }
-}
-
-</script>
-<div id="formWrapper" style="position:relative; background-color: #faf8f3; height:340px; overflow:scroll">
- <div style="text-align:center">
- <div id="relatedArtsMessage" style="display:inline;">{message}</div>
+ <label for="completed">[l]Completed[/l]</label>
+ <input type="checkbox" id="completed" name="completed" {completedChecked}/>
+ <div class="clear"></div>
+ </form>
+ <div id="relatedArticlesDiv">
+ {relatedArticlesTable}
</div>
- <div style="position:relative; border:1px solid black">
- <table class="todoTable" cellspacing="1" cellpadding="0" border="0">
- <form action="{formAction}" method="POST">
- <input type="hidden" name="todoId" value="{todo_id}" />
- <tr class="th">
- <td colspan="2" width="1%" style="padding:3px 0 3px 0px; font-weight:bold; text-align:center">
- <div style="position:relative; text-align:center; font-weight:bold;">
- {formTitle}
- <span style="position:absolute; right:0">
- <img id="todoProgressImg" src="images/progress.gif" style="display:none" />
- </span>
- </div>
- </td>
- </tr>
- <tr class="row_on">
- <td style="font:normal 12px sans-serif; font-weight:bold; text-align:right">[l]Title[/l]:</td>
- <td><input type="text" name="title" value="{title}" style="width:170px" /></td>
- </tr>
- <tr class="row_on">
- <td style="font:normal 12px sans-serif; font-weight:bold; text-align:right" valign="top">[l]Contents[/l]:</td>
- <td><textarea name="content" style="width:170px; height:100px">{content}</textarea></td>
- </tr>
- <tr class="row_on">
- <td style="font:normal 12px sans-serif; font-weight:bold; text-align:right">[l]Due Date[/l]:</td>
- <td>
- <input type="hidden" id="hiddenDate" name="dueDate" value="{dueDate}" />
- <span id="dateShow">{dueDateContents}</span>
- <img src="images/datepopup.gif" id="dueDateButton" style="cursor:pointer" />
- <span id="labelSetDate" style="display:{labelSetDueDateDisplay}; font: normal 12px sans-serif">([l]Currently none.<br />Click icon to set one.[/l])</span><br />
- <a id="removeDateLink" href="javascript:void(0);" onclick="removeDate();" style="display:{removeDueDateLinkDisplay}; font-weight:bold; font-size:10px">[l]Remove due date[/l]</a>
- </td>
- </tr>
- <tr class="row_on">
- <td colspan="2" style="text-align:center">
- <table width="100%" border="0">
- <tr>
- <td style="width:1%; font:normal 12px sans-serif; font-weight:bold; text-align:right" valign="bottom">[l]Private[/l]:</td>
- <td style="width:1%;" valign="bottom"><input type="checkbox" name="private" {privateChecked}/></td>
- <td style="font:normal 12px sans-serif; font-weight:bold; text-align:right" valign="bottom">[l]Completed[/l]:</td>
- <td style="width:1%;" valign="bottom"><input type="checkbox" name="completed" {completedChecked}/></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr class="row_on">
- <td colspan="2" style="text-align:right">
- <input type="button" value="[l]Save[/l]" onclick="saveTodo(form);"/>
- <!-- BEGIN deleteButton_block -->
- <input type="button" value="[l]Delete[/l]" onclick="deleteTodo();" />
- <!-- END deleteButton_block -->
- </td>
- </tr>
- </form>
- </table>
- <div id="relatedArticlesDiv">
- {relatedArticlesTable}
- </div>
- </div>
</div>
-<script type="text/javascript">
- Calendar.setup(
- {
- inputField : "hiddenDate",
- ifFormat : "%Y-%m-%d",
- daFormat : "{jsCalDateFormat}",
- button : "dueDateButton",
- onSelect : dateSelected
- }
- );
- <!-- BEGIN adjustWinSize_block -->
- _adjustWinSize(300, 460);
- $('formWrapper').style.height = '450px';
- <!-- END adjustWinSize_block -->
-</script>
-</body>
-</html>
Modified: trunk/templates/TodosDropdown.tpl
===================================================================
--- trunk/templates/TodosDropdown.tpl 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/templates/TodosDropdown.tpl 2008-09-16 22:58:24 UTC (rev 679)
@@ -15,10 +15,10 @@
<!-- BEGIN todoItem_block -->
<li>
<!-- BEGIN checkTodo_block -->
- <input id="todoCheck_{todoId}" type="checkbox" onchange="tickTodo({todoId})" /><img id="todoProgressImg_{todoId}" src="images/progress.gif" style="display:none" />
+ <input id="todoCheck_{todoId}" type="checkbox" onchange="SCIRET.todos.tick({todoId})" /><img id="todoProgressImg_{todoId}" src="images/progress.gif" style="display:none" />
<!-- END checkTodo_block -->
<!-- BEGIN linkTodo1_block -->
- <a id="todoLink_{todoId}" href="javascript:void(0)" onclick="showEditTodoForm({todoId})" style="text-decoration:{textDecoration}; {colorStyle}">
+ <a id="todoLink_{todoId}" href="javascript:void(0)" onclick="SCIRET.todos.showForm({todoId})" style="text-decoration:{textDecoration}; {colorStyle}">
<!-- END linkTodo1_block -->
<span class="headerLinks" {descriptionPopup}>{todoTitle}</span>
<!-- BEGIN linkTodo2_block -->
@@ -41,5 +41,5 @@
<div class="headerLinks" style="text-align:center">[l]You have no To-Do's[/l]</div>
<!-- END noTodos_block -->
- <p class="add"><span class="button_green"><a href="javascript:void(0)" onclick="showEditTodoForm()">[l]Add new[/l]</a></span></p>
+ <p class="add"><span class="button_green"><a href="javascript:void(0)" onclick="SCIRET.todos.showForm()">[l]Add new[/l]</a></span></p>
</div>
Modified: trunk/templates/footer.tpl
===================================================================
--- trunk/templates/footer.tpl 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/templates/footer.tpl 2008-09-16 22:58:24 UTC (rev 679)
@@ -64,7 +64,7 @@
<!-- BEGIN todosLink_block -->
<div class="panel" id="favorites">
<div class="panel_title">
- <a href="javascript:void(0)" onclick="dropdownTodos();">[l]ToDo[/l]</a>
+ <a href="javascript:void(0)" onclick="SCIRET.todos.dropdown();">[l]ToDo[/l]</a>
<img id='todosLoading' src='images/progress.gif' style='visibility:hidden' />
</div>
<div class="inside_panel" id="todosDropdown"></div>
Modified: trunk/templates/head.tpl
===================================================================
--- trunk/templates/head.tpl 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/templates/head.tpl 2008-09-16 22:58:24 UTC (rev 679)
@@ -6,6 +6,8 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" type="text/css" href="javascript/yui/build/assets/skins/sam/skin.css">
<link type="text/css" rel="stylesheet" href="javascript/yui/build/logger/assets/skins/sam/logger.css">
+ <link rel="stylesheet" type="text/css" href="javascript/yui/build/container/assets/skins/sam/container.css">
+ <link rel="stylesheet" type="text/css" href="javascript/yui/build/calendar/assets/skins/sam/calendar.css">
<link rel="stylesheet" href="style.css" type="text/css" media="screen" charset="utf-8"/>
<!--[if IE 6]><link rel="stylesheet" href="style_ie6.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
<!--[if IE 7]><link rel="stylesheet" href="style_ie7.css" type="text/css" media="screen" charset="utf-8"><![endif]-->
@@ -16,14 +18,16 @@
<![endif]->
<!-- basic YUI libraries -->
<script type="text/javascript" src="javascript/yui/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+ <script type="text/javascript" src="javascript/yui/build/connection/connection.js"></script>
<script type="text/javascript" src="javascript/tools-min.js"></script>
- <script type="text/javascript" src="javascript/yui/build/container/container_core-min.js"></script>
<script type="text/javascript" src="javascript/yui/build/element/element-beta-min.js"></script>
<script type="text/javascript" src="javascript/yui/build/dragdrop/dragdrop-min.js"></script>
+ <script type="text/javascript" src="javascript/yui/build/container/container.js"></script>
<script type="text/javascript" src="javascript/yui/build/animation/animation-min.js"></script>
<script type="text/javascript" src="javascript/yui/build/button/button-min.js"></script>
- <script type="text/javascript" src="javascript/yui/build/connection/connection-min.js"></script>
+ <script type="text/javascript" src="javascript/yui/build/calendar/calendar-min.js"></script>
<script type="text/javascript" src="javascript/yui/build/logger/logger-min.js"></script>
+ <script type="text/javascript" src="javascript/yui/build/json/json-min.js"></script>
<!-- required by effects.js -->
<script type="text/javascript" src="javascript/effects-min.js"></script>
@@ -31,10 +35,6 @@
<script type="text/javascript" src="javascript/general.js"></script>
<script type="text/javascript" src="javascript/simModal.js"></script>
<script type="text/javascript" src="javascript/overlib.js"></script>
- <style type="text/css">@import url(javascript/jscalendar/calendar-blue.css);</style>
- <script type="text/javascript" src="javascript/jscalendar/calendar.js"></script>
- <script type="text/javascript" src="javascript/jscalendar/lang/calendar-en.js"></script>
- <script type="text/javascript" src="javascript/jscalendar/calendar-setup.js"></script>
<!-- BEGIN rtl_block -->
<style>
input, textarea {
@@ -48,3 +48,4 @@
// var myLogReader = new YAHOO.widget.LogReader();
</script>
<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
+ <div id="todoDialog"></div>
Modified: trunk/views/EditTodo.php
===================================================================
--- trunk/views/EditTodo.php 2008-09-16 22:57:52 UTC (rev 678)
+++ trunk/views/EditTodo.php 2008-09-16 22:58:24 UTC (rev 679)
@@ -18,8 +18,6 @@
$todoId = isset($_GET['id'])? (int)$_GET['id'] : 0;
$this->tpl->set_file('editTodo', 'EditTodo.tpl');
- $this->tpl->set_block('editTodo', 'adjustWinSize_block', 'adjustWinSize');
- $this->tpl->set_block('editTodo', 'deleteButton_block', 'deleteButton');
if (isset($_GET['message'])) {
$this->tpl->set_var('message', '<span class="successMessage"> '.$_GET['message'].' </span>');
@@ -67,8 +65,6 @@
$relatedArticles->setTemplate($this->tpl);
$this->tpl->set_var('relatedArticlesTable', $relatedArticles->dispatch(true));
- $this->tpl->parse('deleteButton', 'deleteButton_block');
- $this->tpl->parse('adjustWinSize', 'adjustWinSize_block');
} else {
$this->tpl->set_var(array(
'formTitle' => $this->user->lang('NEW TO-DO'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-16 15:57:53
|
Revision: 678
http://sciret.svn.sourceforge.net/sciret/?rev=678&view=rev
Author: alpeb
Date: 2008-09-16 22:57:52 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
language fix
Modified Paths:
--------------
trunk/templates/RelatedArticles.tpl
Modified: trunk/templates/RelatedArticles.tpl
===================================================================
--- trunk/templates/RelatedArticles.tpl 2008-09-16 22:57:12 UTC (rev 677)
+++ trunk/templates/RelatedArticles.tpl 2008-09-16 22:57:52 UTC (rev 678)
@@ -49,5 +49,5 @@
</table>
<!-- BEGIN img_delete_block -->
-<a href="{href_del}"><img src="images/delete.gif" alt="[l]Delete[/l]" title="[l]Delete[/l][l]Delete[/l]"></a>
+<a href="{href_del}"><img src="images/delete.gif" alt="[l]Delete[/l]" title="[l]Delete[/l]"></a>
<!-- END img_delete_block -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-16 15:57:13
|
Revision: 677
http://sciret.svn.sourceforge.net/sciret/?rev=677&view=rev
Author: alpeb
Date: 2008-09-16 22:57:12 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
little fix
Modified Paths:
--------------
trunk/models/TodoGateway.php
Modified: trunk/models/TodoGateway.php
===================================================================
--- trunk/models/TodoGateway.php 2008-09-16 22:56:26 UTC (rev 676)
+++ trunk/models/TodoGateway.php 2008-09-16 22:57:12 UTC (rev 677)
@@ -52,8 +52,8 @@
function deleteTodo($todoId, $userId) {
$query = 'SELECT todo_id FROM todos WHERE todo_id = ? AND user_id = ?';
- $result = DB::getInstance()->query($query, $todoId, $userId);
- if (!$result->getNumRows()) {
+ $result = DB::getInstance()->query($query, array($todoId, $userId));
+ if (!$result->rowCount()) {
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-16 15:56:28
|
Revision: 676
http://sciret.svn.sourceforge.net/sciret/?rev=676&view=rev
Author: alpeb
Date: 2008-09-16 22:56:26 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
added entry in views array to determine whether they should load the html head section
Modified Paths:
--------------
trunk/classes/Controller.php
trunk/flowMap.php
Modified: trunk/classes/Controller.php
===================================================================
--- trunk/classes/Controller.php 2008-09-16 21:28:15 UTC (rev 675)
+++ trunk/classes/Controller.php 2008-09-16 22:56:26 UTC (rev 676)
@@ -11,8 +11,9 @@
define('MINIMUM_ROLE', 0);
define('LOAD_CONFIGURATION', 1);
-define('SHOW_HEADER', 2);
-define('ALLOW_VIEW_ONLY_IF_PUBLIC_KB', 3);
+define('SHOW_HEAD', 2);
+define('SHOW_HEADER', 3);
+define('ALLOW_VIEW_ONLY_IF_PUBLIC_KB', 4);
define('ALLOW_ACTION_ONLY_IF_PUBLIC_KB', 2);
require 'models/Configuration.php';
@@ -68,7 +69,9 @@
$obj = new $view($this->user, $this->configuration);
$obj->setTemplate(new KB_Template('templates', $this->user));
$obj->preDispatch();
- $obj->setHTMLHeader($this->views[$view][SHOW_HEADER]);
+ if ($this->views[$view][SHOW_HEAD]) {
+ $obj->setHTMLHeader($this->views[$view][SHOW_HEADER]);
+ }
$obj->dispatch();
if ($this->views[$view][SHOW_HEADER]) {
$obj->showFooter();
Modified: trunk/flowMap.php
===================================================================
--- trunk/flowMap.php 2008-09-16 21:28:15 UTC (rev 675)
+++ trunk/flowMap.php 2008-09-16 22:56:26 UTC (rev 676)
@@ -11,37 +11,37 @@
define('VIEW_DEFAULT', 'MainView');
-// ClassName => array(minimumRole, loadConfiguration, showHeader, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
+// ClassName => array(minimumRole, loadConfiguration, showHead, showHeader, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
$views = array(
- 'NotInstalled' => array(User::ROLE_ANONYMOUS, false, false, false),
- 'InstallEnterCredentials' => array(User::ROLE_ANONYMOUS, false, false, false),
- 'InstallOk' => array(User::ROLE_ANONYMOUS, true, false, false),
- 'Login' => array(User::ROLE_ANONYMOUS, true, true, false),
- 'MainView' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'EditArticle' => array(User::ROLE_REGISTERED, true, true),
- 'EditBookmark' => array(User::ROLE_REGISTERED, true, true),
- 'ViewArticle' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ViewBookmark' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ManageUsers' => array(User::ROLE_ADMIN, true, true),
- 'EditUser' => array(User::ROLE_REGISTERED, true, true),
- 'AddQuestion' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'EditCategories' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'EditCategory' => array(User::ROLE_ADMIN, true, true),
- 'EditPreferences' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ManageArticles' => array(User::ROLE_REGISTERED, true, false),
- 'ManageQuestions' => array(User::ROLE_REGISTERED, true, true),
- 'SearchResults' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'AdvancedSearch' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'PrinterView' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'MailArticle' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ViewComments' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'ViewBookmarkDetails' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'ViewRelatedArticles' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'GetFavoritesDropdown' => array(User::ROLE_REGISTERED, true, false),
- 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, false),
- 'EditTodo' => array(User::ROLE_REGISTERED, true, false),
- 'Upgrade' => array(User::ROLE_ANONYMOUS, true, true, false),
- 'UpgradeOk' => array(User::ROLE_ANONYMOUS, true, true, false),
+ 'NotInstalled' => array(User::ROLE_ANONYMOUS, false, true, false, false),
+ 'InstallEnterCredentials' => array(User::ROLE_ANONYMOUS, false, true, false, false),
+ 'InstallOk' => array(User::ROLE_ANONYMOUS, true, true, false, false),
+ 'Login' => array(User::ROLE_ANONYMOUS, true, true, true, false),
+ 'MainView' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'EditArticle' => array(User::ROLE_REGISTERED, true, true, true),
+ 'EditBookmark' => array(User::ROLE_REGISTERED, true, true, true),
+ 'ViewArticle' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ViewBookmark' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ManageUsers' => array(User::ROLE_ADMIN, true, true, true),
+ 'EditUser' => array(User::ROLE_REGISTERED, true, true, true),
+ 'AddQuestion' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'EditCategories' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'EditCategory' => array(User::ROLE_ADMIN, true, true, true),
+ 'EditPreferences' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ManageArticles' => array(User::ROLE_REGISTERED, true, true, false),
+ 'ManageQuestions' => array(User::ROLE_REGISTERED, true, true, true),
+ 'SearchResults' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'AdvancedSearch' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'PrinterView' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'MailArticle' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ViewComments' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'ViewBookmarkDetails' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'ViewRelatedArticles' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'GetFavoritesDropdown' => array(User::ROLE_REGISTERED, true, true, false),
+ 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, true, false),
+ 'EditTodo' => array(User::ROLE_REGISTERED, true, false, false),
+ 'Upgrade' => array(User::ROLE_ANONYMOUS, true, true, true, false),
+ 'UpgradeOk' => array(User::ROLE_ANONYMOUS, true, true, true, false),
);
// ClassName => array(minimumRole, loadConfiguration, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-09-16 14:28:18
|
Revision: 675
http://sciret.svn.sourceforge.net/sciret/?rev=675&view=rev
Author: reinerj
Date: 2008-09-16 21:28:15 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
add Hungary translation from Csatay Krisztian
Added Paths:
-----------
branches/release-candidates/sciret-1.2/languages/Hungarian.txt
Added: branches/release-candidates/sciret-1.2/languages/Hungarian.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/Hungarian.txt (rev 0)
+++ branches/release-candidates/sciret-1.2/languages/Hungarian.txt 2008-09-16 21:28:15 UTC (rev 675)
@@ -0,0 +1,1082 @@
+#Maked by Krisztian Csatay alias pomm
+#WEB: http://pomm.hu
+#E-MAIL: in...@po...
+
+Action
+Akció
+
+Add Article
+Cikk hozzáadása
+
+Add article to favorites
+Cikk hozzáadása a Kedvencekhez
+
+Add articles
+Cikk hozzáadása
+
+Add Articles/Bookmarks
+Cikk, Könyvjelző hozzáadása
+
+Add Bookmark
+Könyvjelző hozzáadása
+
+Add bookmark to favorites
+Könyvjelző hozzáadása a Kedvencekhez
+
+Add Category
+Kategória hozzáadása
+
+Add link
+Hivatkozás hozzáadása
+
+Add location to favorites
+Hely hozzáadása a Kedvencekhez
+
+Add new
+Új hozzáadása
+
+Add results to favorites
+Az eredmény hozzáadása a Kedvencekhez
+
+Add subcategory
+Alkategória hozzáadása
+
+Add User
+Felhasználó hozzáadása
+
+Added comment
+Megjegyzés hozzáadása
+
+Added related article
+A kapcsolódó cikk hozzáadása
+
+Admin rights
+Admin jogosultság
+Administrative Rechte
+
+Advanced Search
+Részletes keresés
+
+All
+Mind
+
+All Articles
+Összes cikk
+
+Allow comments and ratings
+A megjegyzések és osztályozások engedélyezése
+Kommentare und Bewertung erlauben
+
+Anywhere in the article/bookmark
+Bárhol a cikkekben/könyvjelzőkben
+
+Always start browsing
+Mindig ezzel a nézettel kezdeni
+
+answer
+válasz
+
+Answer
+Válasz
+
+anytime
+Összes
+
+Anywhere in the article
+Bárhol a cikkben
+
+Are you sure you wish to delete the article title?
+Biztos benne, a kiválasztott cikket törölni szeretné?
+
+Are you sure you want to delete the bookmark?
+Biztos benne, hogy a kiválasztott könyvjelzőt törölni szeretné?
+
+Are you sure you want to delete the category?
+Biztos benne, hogy a kiválasztott kategóriát törölni szeretné?
+
+Are you sure you wish to delete user?
+Biztos benne, hogy a kiválasztottsen felhasználót törölni szeretné?
+
+Are you sure you wish to mark this TO-DO as completed?
+Biztos benne, hogy a kiválasztott TO-DO olvasottnak szeretné jelölni?
+
+Article
+Cikk
+
+Articles and Bookmarks
+Cikkek és Könyvjelzők
+
+Article created
+Cikk létrehozva
+
+Article deleted successfully
+Cikk törölve
+
+Article does not exist
+Ez a cikk nem létezik
+
+Article has beed added to favorites successfully
+A cikket hozzáadtuk a Kedvencekhez
+
+Article has been commented and rated successfully
+Cikk wurde erfolgreich kommnetiert und bewertet
+
+Article has been rated successfully
+Cikk osztályozva
+
+Article has been removed from favorites successfully
+A cikket töröltük a kedvencekből
+
+Article hasn't been commented
+A cikkhez még nincs megjegyzés fűzve
+
+Article ID
+Cikk ID
+
+Article modified
+Cikk módosítva
+
+Article published successfully
+Cikk publikálva
+
+Article rated
+Cikk osztályozva
+
+Article saved successfully.
+Cikk mentve.
+
+Articles
+Cikk
+
+Articles only
+Csak a cikkeket
+
+Ascendent
+Emelkedő
+
+Attach File
+Fájl csatolás
+
+Attached Files
+Csatolt fájlok
+
+Attached Knowledge Base Article:
+Csatolt fájlok:
+
+Author
+Szerző
+
+Average rating
+Közepes osztályozás
+
+Before submiting a question, please search in the knowledge base first
+Mielőtt feltesz egy kérdést, kérem előtte nézze meg a tudásbázist
+
+Bookmark
+Könyvjelző
+
+Bookmarks
+Könyvjelzők
+
+Bookmarks saved successfully
+Könyvjelzők wurden erfolgreich gespeichert
+
+Bookmarks only
+Csak a könyvjelzőket
+
+Browse unpublished articles/bookmarks
+A nem publikált cikkekk/könyvjelzők mutatása
+
+by
+>>
+
+Category
+Kategória
+
+Category deleted successfully
+Kategória törölve
+
+Category saved successfully
+Kategória mentve
+
+Category will be shown in the future
+Ez a kategória a jövőben elérhető lesz
+
+Clear
+Tisztít
+
+comment
+Megjegyzés
+
+Comment deleted successfully
+Megjegyzés törölve
+
+Comment published successfully
+A megjegyzés publikálva
+
+Comment saved successfully
+Megjegyzés mentve
+
+Comments
+Megjegyzések
+
+Completed
+Teljes
+
+Contents
+Összetevők
+
+Continue
+Tovább
+
+Couldn't connect to database
+Nem lehet csatlakozni az adatbázishoz
+
+Couldn't connect to the database.
+Nem lehet csatlakozni az adatbázishoz.
+
+Couldn't create database. Please create it manually and try again.
+Nem lehet létrehozni az adatbázist. Kérem hozza létre manuálisan és próbálkozzon újra.
+
+Created by %s on %s
+Létrehozta %s %s
+
+Created on
+Létrehozva
+
+Creating new article to answer question made by %s on %s
+Új cikk létrhozása, válaszolva a %s által %s feltett kérdésére
+
+Creation Date
+Létrehozás
+
+Creation date
+Létrehozás dátuma
+
+Creator
+Szerző
+
+Current category and subcategories
+Aktuális kategória és alkategória
+
+Current category only
+Csak az aktuális kategória
+
+Currently none.<br />Click icon to set one.
+Pillanatnyilag nincs.<br />Klikkeljen az ikonra, hogy létrehozzon egyet.
+
+Database Hostname
+Adatbázis Hostnév
+
+Database Name
+Adatbázis Neve
+
+Database Username
+Adatbázis felhasználói név
+
+Database Username Password
+Adatbázis felhasználói jelszó
+
+Date
+Dátum
+
+Date format
+Dátum formátum
+
+Days before password expires
+A jelszó lejáratának napja
+
+Delete
+Törlés
+
+delete
+Törlés
+
+Delete Article
+Cikk törlése
+
+Delete Bookmark
+Könyvjelző törlése
+
+Deleted reference to related article successfully
+A cikkhz kapcsolódó ajánlás törölve
+
+Deleted related article
+A kapcsolódó cikk törölve
+
+Descendent
+Csökkenő
+
+Description
+Megjegyzés
+
+details
+Feladatok
+
+did not match any documents.
+nem találtam egyező dokumentumot.
+
+documents found
+dokumentum megtalálva
+
+Drafts Only
+Csak előnézet
+
+Due Date
+Esedékes dátum
+
+Edit
+Szerkesztés
+
+edit
+Szerkesztés
+
+Edit Bookmark
+Könyvjelző szerkesztése
+
+Edit/Add Category
+Kategória szerkesztése/hozzáadása
+
+Edit Article
+Cikk szerkesztése
+
+Edit Categories
+Kategóriák szerkesztése
+
+Enter one or two words describing the issue, or type the article number if you know it
+Adjon meg a kereséshez egy vagy több kulcsszót, vagy adja meg a cikk számát, ha ismeri
+
+Enter the Knowledge Base!!
+Bejelentkezés a Tudásbázisba!
+
+Enter your credentials
+Geben Sie Ihre Zugangsdaten ein
+
+Error uploading file
+Hiba a fájl feltöltése közben
+Es ist ein Fehler beim hochladen der Datei aufgetreten
+
+Error: article does not exist
+Hiba: a keresett cikk nem található
+
+Error: this article hasn't yet been published
+Hiba: Ez a cikk még nem publikus
+
+Excellent
+Kiválló
+
+Excerpt
+Kivonat
+Auszug
+
+Expiration Date
+Lejárat
+
+E-mail
+E-mail
+
+E-mail article
+Cikk küldése E-mail-ben
+
+Favorites
+Kedvencek
+
+File deleted on database but note there was an error attempting to delete it from the filesystem
+A fájl törölve lett az adatbázisból, de a kisérlet a fájl eltávolítására a fájlrendszerből hibát eredményzett
+Die Datei wurde aus der Adatbázis entfernt, es trat jedoch ein Fehler auf beim Löschzufriff im Dateisystem
+
+File deleted successfully
+Fájl törölve
+
+File not found (1)
+A fájl nem található (1)
+
+File not found (2)
+A fájl nem található (2)
+
+File uploaded successfully
+A fájl feltöltve
+
+File '%s' attached
+A fájl '%s' csatolva
+
+File '%s' deleted
+A fájl '%s' törölve
+
+Find Results
+Keresési beállítások
+
+First Name
+Vezetéknév
+
+Give Admin access?
+Adminisztrátor jogosultság?
+
+Hide
+Elrejtés
+
+His articles will get passed to the main Admin User.
+Ezt a cikket továbbítottuk az Adminisztrátorhoz
+Dieser Cikk wird weitergeleitet zum Administrator
+
+History
+Előzmény
+
+Home
+Kezdőlap
+
+Icon
+Ikon
+
+If this is the first time you enter the Knowledge Base please proceed with the installation.
+Ha ez az első alkalom, hogy belép a Tudásbázisba, akkor kérem elösször végezze el a telepítést.
+Falls Sie zum ersten mal die Tudásbázis benutzen fahren Sie bitte mit der installation fort.
+
+If you can't find answers to your problem in the knowledge base, describe it below
+Ha Ön nem találja a választ a problémájára a Tudásbázisba, tegye fel akérédését alant.
+
+If you wish, you can add comments here
+Ha szeretné, itt tud hozzászólni
+
+If you wish, you can comment this article here
+Ha szeretné itt tud hozzászólni a cikkhez
+
+In the article's title
+A cikkek címében
+
+In the article's content
+A cikkek tartalmában
+
+In the article's content/bookmark description
+A cikkek/könyvjelzők leírásában
+
+In the title
+A címben
+
+in %s
+%s
+
+Include subcategories
+Alkategóriákban
+
+Including the exact phrase
+Tartalmazza ezt a kifejezést
+Nach dem ganzen Begriff suchen
+
+Including these words*
+Tartalmazza ezt a szót*
+Diese Worte einbeziehen*
+
+Insert demo data?
+A demó adatokat szeretné telepíteni?
+Demo Daten einspielen?
+
+Install
+Telepítés
+
+Installation was successful!
+A telepítés sikeres!
+Die Installation wurde erfolgreich durchgeführt!
+
+Internal article by default
+Alapértelmezetten a nem nyilvános cikkek használata
+Interner Cikk als standard festlegen
+
+Internal use only
+Csak regisztrált felhasználók
+
+Invalid article ID
+Érvénytelen cikk ID
+
+Invalid recipient
+Érvénytelen címzett
+
+Invalid Reply-To address
+Érvénytelen válaszcím
+
+Knowledge Base
+Tudásbázis
+
+Language
+Nyelv
+
+Last Modified
+Utoljára módosította
+
+Last modification on
+Utoljára módosította
+
+Last Name
+Keresztnév
+
+Latest
+Újabb Cikk
+
+Link deleted successfully
+Link törölve
+
+Link saved successfully
+Link mentve
+
+Link '%s' added
+Link '%s' hozzáadva
+
+Link '%s' removed
+Link '%s' törölve
+
+Links
+Linkek
+
+Links & Files
+Linkek és Fájlok
+
+Location has been added to favorites successfully
+Diese Stelel wurde erfolgreich hinzugefügt zu den Favoriten
+
+Location has been removed from favorites successfully
+Erfolgreich entfernt von den Favoriten
+
+Login
+Bejelentkezés
+
+Logout
+Kijelentkezés
+
+Mail article
+Cikk küldése E-mail-ben
+
+Manage Articles
+Cikk szerkesztése
+
+Manage Articles/Bookmarks
+Cikkek/Könyvjelzők szerkesztése
+
+Make knowledge base public
+Tudásbázis öffentlich zugänglich machen
+
+Manage Questions
+Kérdések szerkesztése
+
+Make sure all words are spelled correctly.
+Figyeljen arra, hogy minden szót helyesen írjon.
+Stellen Sie bitte sicher das Ihre Begriffe korrekt geschrieben sind.
+
+Manage Categories
+Kategóriák szerkesztése
+
+Manage Items
+Cikkek szerkesztése
+
+Manage Users
+Felhasználók szerkesztése
+
+Maximum file size
+Maximális fájlméret
+
+Message
+Üzenet
+
+Modification date
+Az utolsó módosítás dátuma
+
+Month Day, Year
+Év, Hónap, Nap
+
+Most Viewed
+A legtöbbet olvasott cikk
+
+Name
+Név
+
+Never
+Soha
+
+Never expires
+Soha
+
+NEW TO-DO
+Új TO-DO
+
+Next
+Következő
+
+No
+Nem
+
+No articles/bookmarks related
+Keine verwandten Cikk/Bookmarks
+
+No events recorded
+Bisher keine Vorgänge
+
+No files attached
+Nincs csatolt fájl
+
+No links referenced
+Keine verwandten Links
+
+No matches were found
+Keine Übereinstimmungen gefunden
+
+Nobody has rated this article so far
+Dieser Cikk wurde noch nicht bewertet
+
+Nobody has rated this item
+Bisher wurde keine Bewertung vorgenommen
+
+None
+Nincs
+
+Nothing was uploaded
+Nincs feltöltés
+
+Number of articles per page
+A megjelenitendő cikkek száma oldalanként
+
+Occurrences
+Soll vorkommen
+
+Only admin and author can modify an article
+Csak az adminisztrátor vagy a szerző tudja megváltozatni a cikkeket.
+
+Only Articles
+Csak cikkek
+
+Only Bookmarks
+Csak könyvjelzők
+
+Order results by
+Rendezés a következők szerint
+
+Parent Category
+Übergeordnete Kategória
+
+password
+Jelszó
+
+Password
+Jelszó
+
+past 3 months
+Az utolsó 3 hónap
+
+past 6 months
+Az utolsó 6 hónap
+
+past year
+Az utolsó év
+
+People have rated this article
+Dieser Cikk wurde von den Benutzern beurteilt mit
+
+Please enter your name to post a comment
+Kérem adja meg a nevét ha hozzá szeretne szólni
+
+Please rate the pertinence and quality of this article
+Bitte bewerten Sie den Inhalt und Qualität dieses Cikks
+
+Please rate the pertinence and quality of this bookmark
+Bitte bewerten Sie den Inhalt und Qualität dieses Bookmark
+
+Poor
+Rossz
+
+Poster
+Szerző
+
+Preferences
+Beállítások
+
+Preferences saved successfully
+A beállítások mentve
+
+Previous
+Előnézet
+
+Printer view
+Nyomtatási előnézet
+
+Private
+Magán
+
+Publication date
+A publikálás dátuma
+
+Publicly available
+A publikáció mindenkinek elérhető
+
+publish
+publikus
+
+Publish
+publikus
+
+Publish Article
+Publikus cikk
+
+Publish articles automatically
+A cikkek automatikus pubikálása
+
+Publish bookmarks automatically
+A könyvjelzők automatikus pubikálása
+
+Publish comments automatically
+A hozzászólás automatikus pubikálása
+
+Publish questions automatically
+A kérdések automatikus pubikálása
+
+Published
+Publikálva
+
+Question
+Kérdés
+
+Question deleted successfully
+Kérdés törölve
+
+Question published successfully
+A kérdés publikálva
+
+Recipient (only one allowed)
+Címzett ( csak egyet adjon meg )
+
+Related Articles
+Ähnliche Cikk
+
+Related articles in the Knowledge Base
+Verwandte Cikk in der Tudásbázis
+
+Related articles saved successfully
+Verwandte Cikk wurden gespeichert
+
+Related Articles/Bookmarks
+Verwandte Cikk/Bookmarks
+
+Remove article from favorites
+A cikk törölve a kedvencekből
+
+Remove bookmark from favorites
+A könyvjelző törölve a kedvencekből
+
+Remove location from favorites
+Diese Stelle aus den Favoriten löschen
+
+Remove results from favorites
+Das Ergebnis von den Favoriten entfernen
+
+Repeat password
+Jelszó megerősítése
+
+Reply-To address
+Válaszcím
+Antwort an folgende Adresse
+
+Save
+Mentés
+
+Save as Draft
+Mentés piszkozatként
+
+Search
+Keresés
+
+Search has been added to favorites successfully
+A keresés hozzáadva a kedvencekhez
+Die Suche wurde erfolgreich zu den Favoriten hinzugefügt
+
+Search has been removed from favorites successfully
+A keresés törölve a kedvencekből
+Die Suche wurde erfolgreich aus den Favoriten entfernt
+
+Search in
+Keresés
+
+Search in all the Knowledge Base
+Keresés a teljes Tudásbázisban
+
+Search in category
+Keresés a következő kategóriában
+
+Search Results
+Találatok
+
+seconds
+másodperc
+
+Select
+kiválasztás
+
+Select articles
+Cikk kiválasztása
+
+Select Category
+Egy kategória kiválasztása
+
+Send
+Küldés
+
+Send mail from (email)
+E-mail küldő (E-mail cím)
+
+Send mail from (name)
+E-mail küldő (Név)
+
+Send mail using
+E-mail küldése ezzel
+
+Separate word list with spaces
+A szavakat szóközzel válassza el
+Trennen Sie die Worte durch Leerzeichen
+
+Show
+Sichtbar
+
+Show articles from
+A cikkek mutatása
+
+Show messages in category
+Az üzenetek mutatása a kategóriákban
+Nachrichten in der Kategória anzeigen
+
+SMTP password
+SMTP jelszó
+
+SMTP port
+SMTP Port
+
+SMTP server
+SMTP Szerver
+
+SMTP settings
+SMTP beállítás
+
+SMTP user
+SMTP felhasználó
+
+Sorry, there was a problem trying to send the e-mail. Please try again later.
+Sajnos probléma adódott az e-mail elküldése közben. Kérem próbálja meg később.
+Leider ist ein Problem beim versenden der e-mail aufgetreten. Bitte versuchen Sie es nochmals später.
+
+Sorry, this article is for internal use only.
+Dieser Cikk kann nur intern benutzt werden
+
+Sort by:
+Rendezés
+
+Subject
+Tárgy
+
+Submit
+Elküldés
+
+Submit comment
+Megjegyzés elküldése
+Kommentar absenden
+
+Submit comment and rating
+Kommentare und Beurteilung absenden
+
+Submit Question
+Kérdés hozzáadása
+
+Suggestions
+Vorschläge
+
+Target
+Cél
+
+The articles database is empty
+A cikkek adatbázisa üres
+
+There are no articles under this category
+Es sind keine ähnlichen Cikk vorhanden
+
+There are no categories
+Nincs ilyen kategória
+Keine Kategórian vorhanden
+
+There are no comments so far
+Es sind keine Kommentare vorhanden
+
+There are no files attached
+Es sind keine Dateien angefügt
+
+There are no links referenced
+Es sind keine Links referenziert
+
+There are no related articles
+Es sind keine ähnlichen Cikk vorhanden
+
+The superadministrator user was created, with the username 'admin' and password 'admin'
+Es wurde ein administratives Benutzerkonto erstellt mit dem Benutzernamen "Admin" und dem Passwort "admin"
+
+This article hasn't yet been published in the Knowledge Base
+Dieser Cikk wurde noch nicht für die Tudásbázis freigegeben
+
+Title
+Cím
+
+To be able to continue, please make your config.php file writable and then press Continue.
+Um vortzufahren machen Sie bitte Ihre config.php schreibbar und drücken Sie Enter
+
+ToDo
+Feladatok
+
+Try different keywords.
+Benutzen Sie bitte unterschiedliche Stichwörter
+
+Try with rare keywords, that would more likely appear in the kind of document you're looking for.
+Versuchen Sie es bitte mit eindeutigeren Schlüsselworten. Dies wird die Suche nach einem passenden Dokument einschränken.
+
+Unanswered Questions
+Megválaszolatlan kérdések
+
+Unpublished
+Publikálatlan
+
+Upload
+Feltöltés
+
+Usage
+Jogosultságok
+
+User
+Felhasználó
+
+User added successfully
+Felhasználó hozzáadva
+
+User Data
+Felhasználói adatok
+
+User deleted successfully
+Felhasználó törölve
+
+User edited successfully
+Felhasználó szerkesztése
+
+UserName
+Felhasználónév
+
+User Name
+Felhasználónév
+
+Username
+Felhasználónév
+
+View All
+Mutasd mindet
+
+Viewing All Articles
+Nézet: Csak a cikkek
+
+Viewing All Articles and Bookmarks
+Nézet: Minden cikk és könyvjelző
+
+Viewing All Bookmarks
+Nézet: Csak könyvjelzők
+
+views
+Nézet
+
+Views
+Nézet
+
+Views Unpublished
+Publikálatlan nézet
+
+View Unpublished and Drafts Only
+Zeige nur Unveröffentlichte und Entwürfe
+
+View Unpublished Only
+Nur unveröffentlichte Anzeigen
+
+With at least one of these words*
+Legalább egy szó egyezzen a felsoroltak közül*
+Mindestens eines der folgenden Worte muss vorkommen
+
+Without these words*
+Ami nem tartalmazza ezt a szót*
+
+Wrong category ID
+Hibás kategória ID
+
+Wrong comment ID
+Falsche Kommentar ID
+
+Wrong file ID
+Hibás cikk ID
+
+Wrong link ID
+Hibás link ID
+
+Wrong Username or Password
+Hibás felhasználónév vagy jelszó
+
+Yes
+Igen
+
+You are in %s
+Ön a %s kategóriában van
+
+You can't delete the main administrator user.
+Der administrative Benutzeraccount kann nicht gelöscht werden
+
+You don't have the permission to perform this operation
+Sie haben nicht die notwendigen Rechte um diese Funktion auszuführen
+
+You have already rated this article
+Sie haben diesen Cikk schon bewertet. Eine weitere Bewertung ist nicht möglich.
+
+You have already rated this bookmark
+Sie haben diesen Bookmark schon bewertet. Eine weitere Bewertung ist nicht möglich.
+
+You have no Favorites
+Önnek nem állított be kedvenceket
+
+You have no To-Do's
+Önnek nincs feladata
+
+You must enter your name
+Adja meg a nevét
+Sie müssen Ihren Namen eingeben
+
+You need to fill at least the Name field
+Sie müssen mindestens den Namen eingeben
+
+You need to fill the following fields:
+Sie müssen die folgenden Felder ausfüllen
+
+Your article will be publicly available immediately
+Az Ön cikke mindenki számára elérhető lesz.
+
+Your article won't be available publicly until it is explicitly set as "Published"
+Ihr Cikk wird nicht automatisch veröffentlicht bis er explizit freigegeben wurde
+
+Your bookmark won't be available publicly until it is explicitly set as "Published"
+Ihr Bookmark wird nicht automatisch veröffentlicht bis er explizit freigegeben wurde
+
+Your bookmark will be publicly available immediately
+Ihr Bookmark wird umgehend veröffentlicht
+
+Your Name
+Az Ön neve
+
+Your name
+Az Ön neve
+
+Your question was added successfully
+A kérdését elküldtük
+
+Your question was empty
+Ön nem tett fel kérdést
+
+Your question will be published immediately
+Ihre Frage wird umgehend veröffentlicht
+
+Your question will need to get approved before being published
+Ihre Frage wird zuerst geprüft bevor diese veröffentlicht wird
+
+Your search
+Az Ön keresése
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2008-09-16 14:26:01
|
Revision: 674
http://sciret.svn.sourceforge.net/sciret/?rev=674&view=rev
Author: reinerj
Date: 2008-09-16 21:25:54 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
add Hungary translation from Csatay Krisztian
Added Paths:
-----------
trunk/languages/Hungarian.txt
Added: trunk/languages/Hungarian.txt
===================================================================
--- trunk/languages/Hungarian.txt (rev 0)
+++ trunk/languages/Hungarian.txt 2008-09-16 21:25:54 UTC (rev 674)
@@ -0,0 +1,1082 @@
+#Maked by Krisztian Csatay alias pomm
+#WEB: http://pomm.hu
+#E-MAIL: in...@po...
+
+Action
+Akció
+
+Add Article
+Cikk hozzáadása
+
+Add article to favorites
+Cikk hozzáadása a Kedvencekhez
+
+Add articles
+Cikk hozzáadása
+
+Add Articles/Bookmarks
+Cikk, Könyvjelző hozzáadása
+
+Add Bookmark
+Könyvjelző hozzáadása
+
+Add bookmark to favorites
+Könyvjelző hozzáadása a Kedvencekhez
+
+Add Category
+Kategória hozzáadása
+
+Add link
+Hivatkozás hozzáadása
+
+Add location to favorites
+Hely hozzáadása a Kedvencekhez
+
+Add new
+Új hozzáadása
+
+Add results to favorites
+Az eredmény hozzáadása a Kedvencekhez
+
+Add subcategory
+Alkategória hozzáadása
+
+Add User
+Felhasználó hozzáadása
+
+Added comment
+Megjegyzés hozzáadása
+
+Added related article
+A kapcsolódó cikk hozzáadása
+
+Admin rights
+Admin jogosultság
+Administrative Rechte
+
+Advanced Search
+Részletes keresés
+
+All
+Mind
+
+All Articles
+Összes cikk
+
+Allow comments and ratings
+A megjegyzések és osztályozások engedélyezése
+Kommentare und Bewertung erlauben
+
+Anywhere in the article/bookmark
+Bárhol a cikkekben/könyvjelzőkben
+
+Always start browsing
+Mindig ezzel a nézettel kezdeni
+
+answer
+válasz
+
+Answer
+Válasz
+
+anytime
+Összes
+
+Anywhere in the article
+Bárhol a cikkben
+
+Are you sure you wish to delete the article title?
+Biztos benne, a kiválasztott cikket törölni szeretné?
+
+Are you sure you want to delete the bookmark?
+Biztos benne, hogy a kiválasztott könyvjelzőt törölni szeretné?
+
+Are you sure you want to delete the category?
+Biztos benne, hogy a kiválasztott kategóriát törölni szeretné?
+
+Are you sure you wish to delete user?
+Biztos benne, hogy a kiválasztottsen felhasználót törölni szeretné?
+
+Are you sure you wish to mark this TO-DO as completed?
+Biztos benne, hogy a kiválasztott TO-DO olvasottnak szeretné jelölni?
+
+Article
+Cikk
+
+Articles and Bookmarks
+Cikkek és Könyvjelzők
+
+Article created
+Cikk létrehozva
+
+Article deleted successfully
+Cikk törölve
+
+Article does not exist
+Ez a cikk nem létezik
+
+Article has beed added to favorites successfully
+A cikket hozzáadtuk a Kedvencekhez
+
+Article has been commented and rated successfully
+Cikk wurde erfolgreich kommnetiert und bewertet
+
+Article has been rated successfully
+Cikk osztályozva
+
+Article has been removed from favorites successfully
+A cikket töröltük a kedvencekből
+
+Article hasn't been commented
+A cikkhez még nincs megjegyzés fűzve
+
+Article ID
+Cikk ID
+
+Article modified
+Cikk módosítva
+
+Article published successfully
+Cikk publikálva
+
+Article rated
+Cikk osztályozva
+
+Article saved successfully.
+Cikk mentve.
+
+Articles
+Cikk
+
+Articles only
+Csak a cikkeket
+
+Ascendent
+Emelkedő
+
+Attach File
+Fájl csatolás
+
+Attached Files
+Csatolt fájlok
+
+Attached Knowledge Base Article:
+Csatolt fájlok:
+
+Author
+Szerző
+
+Average rating
+Közepes osztályozás
+
+Before submiting a question, please search in the knowledge base first
+Mielőtt feltesz egy kérdést, kérem előtte nézze meg a tudásbázist
+
+Bookmark
+Könyvjelző
+
+Bookmarks
+Könyvjelzők
+
+Bookmarks saved successfully
+Könyvjelzők wurden erfolgreich gespeichert
+
+Bookmarks only
+Csak a könyvjelzőket
+
+Browse unpublished articles/bookmarks
+A nem publikált cikkekk/könyvjelzők mutatása
+
+by
+>>
+
+Category
+Kategória
+
+Category deleted successfully
+Kategória törölve
+
+Category saved successfully
+Kategória mentve
+
+Category will be shown in the future
+Ez a kategória a jövőben elérhető lesz
+
+Clear
+Tisztít
+
+comment
+Megjegyzés
+
+Comment deleted successfully
+Megjegyzés törölve
+
+Comment published successfully
+A megjegyzés publikálva
+
+Comment saved successfully
+Megjegyzés mentve
+
+Comments
+Megjegyzések
+
+Completed
+Teljes
+
+Contents
+Összetevők
+
+Continue
+Tovább
+
+Couldn't connect to database
+Nem lehet csatlakozni az adatbázishoz
+
+Couldn't connect to the database.
+Nem lehet csatlakozni az adatbázishoz.
+
+Couldn't create database. Please create it manually and try again.
+Nem lehet létrehozni az adatbázist. Kérem hozza létre manuálisan és próbálkozzon újra.
+
+Created by %s on %s
+Létrehozta %s %s
+
+Created on
+Létrehozva
+
+Creating new article to answer question made by %s on %s
+Új cikk létrhozása, válaszolva a %s által %s feltett kérdésére
+
+Creation Date
+Létrehozás
+
+Creation date
+Létrehozás dátuma
+
+Creator
+Szerző
+
+Current category and subcategories
+Aktuális kategória és alkategória
+
+Current category only
+Csak az aktuális kategória
+
+Currently none.<br />Click icon to set one.
+Pillanatnyilag nincs.<br />Klikkeljen az ikonra, hogy létrehozzon egyet.
+
+Database Hostname
+Adatbázis Hostnév
+
+Database Name
+Adatbázis Neve
+
+Database Username
+Adatbázis felhasználói név
+
+Database Username Password
+Adatbázis felhasználói jelszó
+
+Date
+Dátum
+
+Date format
+Dátum formátum
+
+Days before password expires
+A jelszó lejáratának napja
+
+Delete
+Törlés
+
+delete
+Törlés
+
+Delete Article
+Cikk törlése
+
+Delete Bookmark
+Könyvjelző törlése
+
+Deleted reference to related article successfully
+A cikkhz kapcsolódó ajánlás törölve
+
+Deleted related article
+A kapcsolódó cikk törölve
+
+Descendent
+Csökkenő
+
+Description
+Megjegyzés
+
+details
+Feladatok
+
+did not match any documents.
+nem találtam egyező dokumentumot.
+
+documents found
+dokumentum megtalálva
+
+Drafts Only
+Csak előnézet
+
+Due Date
+Esedékes dátum
+
+Edit
+Szerkesztés
+
+edit
+Szerkesztés
+
+Edit Bookmark
+Könyvjelző szerkesztése
+
+Edit/Add Category
+Kategória szerkesztése/hozzáadása
+
+Edit Article
+Cikk szerkesztése
+
+Edit Categories
+Kategóriák szerkesztése
+
+Enter one or two words describing the issue, or type the article number if you know it
+Adjon meg a kereséshez egy vagy több kulcsszót, vagy adja meg a cikk számát, ha ismeri
+
+Enter the Knowledge Base!!
+Bejelentkezés a Tudásbázisba!
+
+Enter your credentials
+Geben Sie Ihre Zugangsdaten ein
+
+Error uploading file
+Hiba a fájl feltöltése közben
+Es ist ein Fehler beim hochladen der Datei aufgetreten
+
+Error: article does not exist
+Hiba: a keresett cikk nem található
+
+Error: this article hasn't yet been published
+Hiba: Ez a cikk még nem publikus
+
+Excellent
+Kiválló
+
+Excerpt
+Kivonat
+Auszug
+
+Expiration Date
+Lejárat
+
+E-mail
+E-mail
+
+E-mail article
+Cikk küldése E-mail-ben
+
+Favorites
+Kedvencek
+
+File deleted on database but note there was an error attempting to delete it from the filesystem
+A fájl törölve lett az adatbázisból, de a kisérlet a fájl eltávolítására a fájlrendszerből hibát eredményzett
+Die Datei wurde aus der Adatbázis entfernt, es trat jedoch ein Fehler auf beim Löschzufriff im Dateisystem
+
+File deleted successfully
+Fájl törölve
+
+File not found (1)
+A fájl nem található (1)
+
+File not found (2)
+A fájl nem található (2)
+
+File uploaded successfully
+A fájl feltöltve
+
+File '%s' attached
+A fájl '%s' csatolva
+
+File '%s' deleted
+A fájl '%s' törölve
+
+Find Results
+Keresési beállítások
+
+First Name
+Vezetéknév
+
+Give Admin access?
+Adminisztrátor jogosultság?
+
+Hide
+Elrejtés
+
+His articles will get passed to the main Admin User.
+Ezt a cikket továbbítottuk az Adminisztrátorhoz
+Dieser Cikk wird weitergeleitet zum Administrator
+
+History
+Előzmény
+
+Home
+Kezdőlap
+
+Icon
+Ikon
+
+If this is the first time you enter the Knowledge Base please proceed with the installation.
+Ha ez az első alkalom, hogy belép a Tudásbázisba, akkor kérem elösször végezze el a telepítést.
+Falls Sie zum ersten mal die Tudásbázis benutzen fahren Sie bitte mit der installation fort.
+
+If you can't find answers to your problem in the knowledge base, describe it below
+Ha Ön nem találja a választ a problémájára a Tudásbázisba, tegye fel akérédését alant.
+
+If you wish, you can add comments here
+Ha szeretné, itt tud hozzászólni
+
+If you wish, you can comment this article here
+Ha szeretné itt tud hozzászólni a cikkhez
+
+In the article's title
+A cikkek címében
+
+In the article's content
+A cikkek tartalmában
+
+In the article's content/bookmark description
+A cikkek/könyvjelzők leírásában
+
+In the title
+A címben
+
+in %s
+%s
+
+Include subcategories
+Alkategóriákban
+
+Including the exact phrase
+Tartalmazza ezt a kifejezést
+Nach dem ganzen Begriff suchen
+
+Including these words*
+Tartalmazza ezt a szót*
+Diese Worte einbeziehen*
+
+Insert demo data?
+A demó adatokat szeretné telepíteni?
+Demo Daten einspielen?
+
+Install
+Telepítés
+
+Installation was successful!
+A telepítés sikeres!
+Die Installation wurde erfolgreich durchgeführt!
+
+Internal article by default
+Alapértelmezetten a nem nyilvános cikkek használata
+Interner Cikk als standard festlegen
+
+Internal use only
+Csak regisztrált felhasználók
+
+Invalid article ID
+Érvénytelen cikk ID
+
+Invalid recipient
+Érvénytelen címzett
+
+Invalid Reply-To address
+Érvénytelen válaszcím
+
+Knowledge Base
+Tudásbázis
+
+Language
+Nyelv
+
+Last Modified
+Utoljára módosította
+
+Last modification on
+Utoljára módosította
+
+Last Name
+Keresztnév
+
+Latest
+Újabb Cikk
+
+Link deleted successfully
+Link törölve
+
+Link saved successfully
+Link mentve
+
+Link '%s' added
+Link '%s' hozzáadva
+
+Link '%s' removed
+Link '%s' törölve
+
+Links
+Linkek
+
+Links & Files
+Linkek és Fájlok
+
+Location has been added to favorites successfully
+Diese Stelel wurde erfolgreich hinzugefügt zu den Favoriten
+
+Location has been removed from favorites successfully
+Erfolgreich entfernt von den Favoriten
+
+Login
+Bejelentkezés
+
+Logout
+Kijelentkezés
+
+Mail article
+Cikk küldése E-mail-ben
+
+Manage Articles
+Cikk szerkesztése
+
+Manage Articles/Bookmarks
+Cikkek/Könyvjelzők szerkesztése
+
+Make knowledge base public
+Tudásbázis öffentlich zugänglich machen
+
+Manage Questions
+Kérdések szerkesztése
+
+Make sure all words are spelled correctly.
+Figyeljen arra, hogy minden szót helyesen írjon.
+Stellen Sie bitte sicher das Ihre Begriffe korrekt geschrieben sind.
+
+Manage Categories
+Kategóriák szerkesztése
+
+Manage Items
+Cikkek szerkesztése
+
+Manage Users
+Felhasználók szerkesztése
+
+Maximum file size
+Maximális fájlméret
+
+Message
+Üzenet
+
+Modification date
+Az utolsó módosítás dátuma
+
+Month Day, Year
+Év, Hónap, Nap
+
+Most Viewed
+A legtöbbet olvasott cikk
+
+Name
+Név
+
+Never
+Soha
+
+Never expires
+Soha
+
+NEW TO-DO
+Új TO-DO
+
+Next
+Következő
+
+No
+Nem
+
+No articles/bookmarks related
+Keine verwandten Cikk/Bookmarks
+
+No events recorded
+Bisher keine Vorgänge
+
+No files attached
+Nincs csatolt fájl
+
+No links referenced
+Keine verwandten Links
+
+No matches were found
+Keine Übereinstimmungen gefunden
+
+Nobody has rated this article so far
+Dieser Cikk wurde noch nicht bewertet
+
+Nobody has rated this item
+Bisher wurde keine Bewertung vorgenommen
+
+None
+Nincs
+
+Nothing was uploaded
+Nincs feltöltés
+
+Number of articles per page
+A megjelenitendő cikkek száma oldalanként
+
+Occurrences
+Soll vorkommen
+
+Only admin and author can modify an article
+Csak az adminisztrátor vagy a szerző tudja megváltozatni a cikkeket.
+
+Only Articles
+Csak cikkek
+
+Only Bookmarks
+Csak könyvjelzők
+
+Order results by
+Rendezés a következők szerint
+
+Parent Category
+Übergeordnete Kategória
+
+password
+Jelszó
+
+Password
+Jelszó
+
+past 3 months
+Az utolsó 3 hónap
+
+past 6 months
+Az utolsó 6 hónap
+
+past year
+Az utolsó év
+
+People have rated this article
+Dieser Cikk wurde von den Benutzern beurteilt mit
+
+Please enter your name to post a comment
+Kérem adja meg a nevét ha hozzá szeretne szólni
+
+Please rate the pertinence and quality of this article
+Bitte bewerten Sie den Inhalt und Qualität dieses Cikks
+
+Please rate the pertinence and quality of this bookmark
+Bitte bewerten Sie den Inhalt und Qualität dieses Bookmark
+
+Poor
+Rossz
+
+Poster
+Szerző
+
+Preferences
+Beállítások
+
+Preferences saved successfully
+A beállítások mentve
+
+Previous
+Előnézet
+
+Printer view
+Nyomtatási előnézet
+
+Private
+Magán
+
+Publication date
+A publikálás dátuma
+
+Publicly available
+A publikáció mindenkinek elérhető
+
+publish
+publikus
+
+Publish
+publikus
+
+Publish Article
+Publikus cikk
+
+Publish articles automatically
+A cikkek automatikus pubikálása
+
+Publish bookmarks automatically
+A könyvjelzők automatikus pubikálása
+
+Publish comments automatically
+A hozzászólás automatikus pubikálása
+
+Publish questions automatically
+A kérdések automatikus pubikálása
+
+Published
+Publikálva
+
+Question
+Kérdés
+
+Question deleted successfully
+Kérdés törölve
+
+Question published successfully
+A kérdés publikálva
+
+Recipient (only one allowed)
+Címzett ( csak egyet adjon meg )
+
+Related Articles
+Ähnliche Cikk
+
+Related articles in the Knowledge Base
+Verwandte Cikk in der Tudásbázis
+
+Related articles saved successfully
+Verwandte Cikk wurden gespeichert
+
+Related Articles/Bookmarks
+Verwandte Cikk/Bookmarks
+
+Remove article from favorites
+A cikk törölve a kedvencekből
+
+Remove bookmark from favorites
+A könyvjelző törölve a kedvencekből
+
+Remove location from favorites
+Diese Stelle aus den Favoriten löschen
+
+Remove results from favorites
+Das Ergebnis von den Favoriten entfernen
+
+Repeat password
+Jelszó megerősítése
+
+Reply-To address
+Válaszcím
+Antwort an folgende Adresse
+
+Save
+Mentés
+
+Save as Draft
+Mentés piszkozatként
+
+Search
+Keresés
+
+Search has been added to favorites successfully
+A keresés hozzáadva a kedvencekhez
+Die Suche wurde erfolgreich zu den Favoriten hinzugefügt
+
+Search has been removed from favorites successfully
+A keresés törölve a kedvencekből
+Die Suche wurde erfolgreich aus den Favoriten entfernt
+
+Search in
+Keresés
+
+Search in all the Knowledge Base
+Keresés a teljes Tudásbázisban
+
+Search in category
+Keresés a következő kategóriában
+
+Search Results
+Találatok
+
+seconds
+másodperc
+
+Select
+kiválasztás
+
+Select articles
+Cikk kiválasztása
+
+Select Category
+Egy kategória kiválasztása
+
+Send
+Küldés
+
+Send mail from (email)
+E-mail küldő (E-mail cím)
+
+Send mail from (name)
+E-mail küldő (Név)
+
+Send mail using
+E-mail küldése ezzel
+
+Separate word list with spaces
+A szavakat szóközzel válassza el
+Trennen Sie die Worte durch Leerzeichen
+
+Show
+Sichtbar
+
+Show articles from
+A cikkek mutatása
+
+Show messages in category
+Az üzenetek mutatása a kategóriákban
+Nachrichten in der Kategória anzeigen
+
+SMTP password
+SMTP jelszó
+
+SMTP port
+SMTP Port
+
+SMTP server
+SMTP Szerver
+
+SMTP settings
+SMTP beállítás
+
+SMTP user
+SMTP felhasználó
+
+Sorry, there was a problem trying to send the e-mail. Please try again later.
+Sajnos probléma adódott az e-mail elküldése közben. Kérem próbálja meg később.
+Leider ist ein Problem beim versenden der e-mail aufgetreten. Bitte versuchen Sie es nochmals später.
+
+Sorry, this article is for internal use only.
+Dieser Cikk kann nur intern benutzt werden
+
+Sort by:
+Rendezés
+
+Subject
+Tárgy
+
+Submit
+Elküldés
+
+Submit comment
+Megjegyzés elküldése
+Kommentar absenden
+
+Submit comment and rating
+Kommentare und Beurteilung absenden
+
+Submit Question
+Kérdés hozzáadása
+
+Suggestions
+Vorschläge
+
+Target
+Cél
+
+The articles database is empty
+A cikkek adatbázisa üres
+
+There are no articles under this category
+Es sind keine ähnlichen Cikk vorhanden
+
+There are no categories
+Nincs ilyen kategória
+Keine Kategórian vorhanden
+
+There are no comments so far
+Es sind keine Kommentare vorhanden
+
+There are no files attached
+Es sind keine Dateien angefügt
+
+There are no links referenced
+Es sind keine Links referenziert
+
+There are no related articles
+Es sind keine ähnlichen Cikk vorhanden
+
+The superadministrator user was created, with the username 'admin' and password 'admin'
+Es wurde ein administratives Benutzerkonto erstellt mit dem Benutzernamen "Admin" und dem Passwort "admin"
+
+This article hasn't yet been published in the Knowledge Base
+Dieser Cikk wurde noch nicht für die Tudásbázis freigegeben
+
+Title
+Cím
+
+To be able to continue, please make your config.php file writable and then press Continue.
+Um vortzufahren machen Sie bitte Ihre config.php schreibbar und drücken Sie Enter
+
+ToDo
+Feladatok
+
+Try different keywords.
+Benutzen Sie bitte unterschiedliche Stichwörter
+
+Try with rare keywords, that would more likely appear in the kind of document you're looking for.
+Versuchen Sie es bitte mit eindeutigeren Schlüsselworten. Dies wird die Suche nach einem passenden Dokument einschränken.
+
+Unanswered Questions
+Megválaszolatlan kérdések
+
+Unpublished
+Publikálatlan
+
+Upload
+Feltöltés
+
+Usage
+Jogosultságok
+
+User
+Felhasználó
+
+User added successfully
+Felhasználó hozzáadva
+
+User Data
+Felhasználói adatok
+
+User deleted successfully
+Felhasználó törölve
+
+User edited successfully
+Felhasználó szerkesztése
+
+UserName
+Felhasználónév
+
+User Name
+Felhasználónév
+
+Username
+Felhasználónév
+
+View All
+Mutasd mindet
+
+Viewing All Articles
+Nézet: Csak a cikkek
+
+Viewing All Articles and Bookmarks
+Nézet: Minden cikk és könyvjelző
+
+Viewing All Bookmarks
+Nézet: Csak könyvjelzők
+
+views
+Nézet
+
+Views
+Nézet
+
+Views Unpublished
+Publikálatlan nézet
+
+View Unpublished and Drafts Only
+Zeige nur Unveröffentlichte und Entwürfe
+
+View Unpublished Only
+Nur unveröffentlichte Anzeigen
+
+With at least one of these words*
+Legalább egy szó egyezzen a felsoroltak közül*
+Mindestens eines der folgenden Worte muss vorkommen
+
+Without these words*
+Ami nem tartalmazza ezt a szót*
+
+Wrong category ID
+Hibás kategória ID
+
+Wrong comment ID
+Falsche Kommentar ID
+
+Wrong file ID
+Hibás cikk ID
+
+Wrong link ID
+Hibás link ID
+
+Wrong Username or Password
+Hibás felhasználónév vagy jelszó
+
+Yes
+Igen
+
+You are in %s
+Ön a %s kategóriában van
+
+You can't delete the main administrator user.
+Der administrative Benutzeraccount kann nicht gelöscht werden
+
+You don't have the permission to perform this operation
+Sie haben nicht die notwendigen Rechte um diese Funktion auszuführen
+
+You have already rated this article
+Sie haben diesen Cikk schon bewertet. Eine weitere Bewertung ist nicht möglich.
+
+You have already rated this bookmark
+Sie haben diesen Bookmark schon bewertet. Eine weitere Bewertung ist nicht möglich.
+
+You have no Favorites
+Önnek nem állított be kedvenceket
+
+You have no To-Do's
+Önnek nincs feladata
+
+You must enter your name
+Adja meg a nevét
+Sie müssen Ihren Namen eingeben
+
+You need to fill at least the Name field
+Sie müssen mindestens den Namen eingeben
+
+You need to fill the following fields:
+Sie müssen die folgenden Felder ausfüllen
+
+Your article will be publicly available immediately
+Az Ön cikke mindenki számára elérhető lesz.
+
+Your article won't be available publicly until it is explicitly set as "Published"
+Ihr Cikk wird nicht automatisch veröffentlicht bis er explizit freigegeben wurde
+
+Your bookmark won't be available publicly until it is explicitly set as "Published"
+Ihr Bookmark wird nicht automatisch veröffentlicht bis er explizit freigegeben wurde
+
+Your bookmark will be publicly available immediately
+Ihr Bookmark wird umgehend veröffentlicht
+
+Your Name
+Az Ön neve
+
+Your name
+Az Ön neve
+
+Your question was added successfully
+A kérdését elküldtük
+
+Your question was empty
+Ön nem tett fel kérdést
+
+Your question will be published immediately
+Ihre Frage wird umgehend veröffentlicht
+
+Your question will need to get approved before being published
+Ihre Frage wird zuerst geprüft bevor diese veröffentlicht wird
+
+Your search
+Az Ön keresése
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-16 07:23:41
|
Revision: 673
http://sciret.svn.sourceforge.net/sciret/?rev=673&view=rev
Author: alpeb
Date: 2008-09-16 14:23:39 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
favorites and todo boxes weren't sliding all the way to the bottom
Modified Paths:
--------------
trunk/javascript/general.js
trunk/templates/FavoritesDropdown.tpl
trunk/templates/TodosDropdown.tpl
Modified: trunk/javascript/general.js
===================================================================
--- trunk/javascript/general.js 2008-09-15 13:22:11 UTC (rev 672)
+++ trunk/javascript/general.js 2008-09-16 14:23:39 UTC (rev 673)
@@ -35,6 +35,8 @@
isIE7 = false;
}
+isSafari = (document.childNodes && !document.all && !navigator.taintEnabled && !navigator.accentColorName)? true : false;
+
var onloadFunctions = new Array();
// *********************************************************
@@ -329,6 +331,9 @@
var favoritesDropdown = YAHOO.util.Dom.get('favoritesDropdown');
favoritesDropdown.innerHTML = responseObj.responseText;
+ if (isSafari) {
+ favoritesDropdown.style.paddingBottom = '25px';
+ }
new YAHOO.widget.Effects.BlindDown('favoritesDropdown');
isFavoritesDropdownShown = true;
@@ -422,6 +427,9 @@
var todosDropdown = YAHOO.util.Dom.get('todosDropdown');
todosDropdown.innerHTML = responseObj.responseText;
+ if (isSafari) {
+ todosDropdown.style.paddingBottom = '25px';
+ }
new YAHOO.widget.Effects.BlindDown('todosDropdown');
isTodosDropdownShown = true;
Modified: trunk/templates/FavoritesDropdown.tpl
===================================================================
--- trunk/templates/FavoritesDropdown.tpl 2008-09-15 13:22:11 UTC (rev 672)
+++ trunk/templates/FavoritesDropdown.tpl 2008-09-16 14:23:39 UTC (rev 673)
@@ -9,18 +9,20 @@
*/
-->
-<!-- BEGIN favoritesList_block -->
-<ul class="headerLinks">
- <!-- BEGIN favoriteItem_block -->
- <li>
- <!-- BEGIN favoriteItem_img_block -->
- <img src="images/{articleImage}" />
- <!-- END favoriteItem_img_block -->
- <a href="{favoriteItemURL}">{favoriteItemLabel}</a>
- </li>
- <!-- END favoriteItem_block -->
-</ul>
-<!-- END favoritesList_block -->
-<!-- BEGIN noFavorites_block -->
-<div class="headerLinks" style="text-align:center">[l]You have no Favorites[/l]</div>
-<!-- END noFavorites_block -->
+<div style="padding-bottom:5px">
+ <!-- BEGIN favoritesList_block -->
+ <ul class="headerLinks">
+ <!-- BEGIN favoriteItem_block -->
+ <li>
+ <!-- BEGIN favoriteItem_img_block -->
+ <img src="images/{articleImage}" />
+ <!-- END favoriteItem_img_block -->
+ <a href="{favoriteItemURL}">{favoriteItemLabel}</a>
+ </li>
+ <!-- END favoriteItem_block -->
+ </ul>
+ <!-- END favoritesList_block -->
+ <!-- BEGIN noFavorites_block -->
+ <div class="headerLinks" style="text-align:center">[l]You have no Favorites[/l]</div>
+ <!-- END noFavorites_block -->
+</div>
Modified: trunk/templates/TodosDropdown.tpl
===================================================================
--- trunk/templates/TodosDropdown.tpl 2008-09-15 13:22:11 UTC (rev 672)
+++ trunk/templates/TodosDropdown.tpl 2008-09-16 14:23:39 UTC (rev 673)
@@ -9,35 +9,37 @@
*/
-->
-<!-- BEGIN todosList_block -->
-<ul>
- <!-- BEGIN todoItem_block -->
- <li>
- <!-- BEGIN checkTodo_block -->
- <input id="todoCheck_{todoId}" type="checkbox" onchange="tickTodo({todoId})" /><img id="todoProgressImg_{todoId}" src="images/progress.gif" style="display:none" />
- <!-- END checkTodo_block -->
- <!-- BEGIN linkTodo1_block -->
- <a id="todoLink_{todoId}" href="javascript:void(0)" onclick="showEditTodoForm({todoId})" style="text-decoration:{textDecoration}; {colorStyle}">
- <!-- END linkTodo1_block -->
- <span class="headerLinks" {descriptionPopup}>{todoTitle}</span>
- <!-- BEGIN linkTodo2_block -->
- </a>
- <!-- END linkTodo2_block -->
- <!-- BEGIN privateTodo_block -->
- <img src="images/private.png" />
- <!-- END privateTodo_block -->
- <!-- BEGIN hasRelatedFinal_block -->
- <img src="images/article.png" />
- <!-- END hasRelatedFinal_block -->
- <!-- BEGIN hasRelatedDraft_block -->
- <img src="images/article_draft.png" />
- <!-- END hasRelatedDraft_block -->
- </li>
- <!-- END todoItem_block -->
-</ul>
-<!-- END todosList_block -->
-<!-- BEGIN noTodos_block -->
-<div class="headerLinks" style="text-align:center">[l]You have no To-Do's[/l]</div>
-<!-- END noTodos_block -->
+<div style="padding-bottom:5px">
+ <!-- BEGIN todosList_block -->
+ <ul>
+ <!-- BEGIN todoItem_block -->
+ <li>
+ <!-- BEGIN checkTodo_block -->
+ <input id="todoCheck_{todoId}" type="checkbox" onchange="tickTodo({todoId})" /><img id="todoProgressImg_{todoId}" src="images/progress.gif" style="display:none" />
+ <!-- END checkTodo_block -->
+ <!-- BEGIN linkTodo1_block -->
+ <a id="todoLink_{todoId}" href="javascript:void(0)" onclick="showEditTodoForm({todoId})" style="text-decoration:{textDecoration}; {colorStyle}">
+ <!-- END linkTodo1_block -->
+ <span class="headerLinks" {descriptionPopup}>{todoTitle}</span>
+ <!-- BEGIN linkTodo2_block -->
+ </a>
+ <!-- END linkTodo2_block -->
+ <!-- BEGIN privateTodo_block -->
+ <img src="images/private.png" />
+ <!-- END privateTodo_block -->
+ <!-- BEGIN hasRelatedFinal_block -->
+ <img src="images/article.png" />
+ <!-- END hasRelatedFinal_block -->
+ <!-- BEGIN hasRelatedDraft_block -->
+ <img src="images/article_draft.png" />
+ <!-- END hasRelatedDraft_block -->
+ </li>
+ <!-- END todoItem_block -->
+ </ul>
+ <!-- END todosList_block -->
+ <!-- BEGIN noTodos_block -->
+ <div class="headerLinks" style="text-align:center">[l]You have no To-Do's[/l]</div>
+ <!-- END noTodos_block -->
-<p class="add"><span class="button_green"><a href="javascript:void(0)" onclick="showEditTodoForm()">[l]Add new[/l]</a></span></p>
+ <p class="add"><span class="button_green"><a href="javascript:void(0)" onclick="showEditTodoForm()">[l]Add new[/l]</a></span></p>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-15 13:22:17
|
Revision: 672
http://sciret.svn.sourceforge.net/sciret/?rev=672&view=rev
Author: alpeb
Date: 2008-09-15 13:22:11 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
don't return tags in the excerpt
Modified Paths:
--------------
trunk/models/Article.php
Modified: trunk/models/Article.php
===================================================================
--- trunk/models/Article.php 2008-09-15 11:33:08 UTC (rev 671)
+++ trunk/models/Article.php 2008-09-15 13:22:11 UTC (rev 672)
@@ -240,7 +240,7 @@
}
function getExcerpt() {
- return $this->excerpt;
+ return strip_tags($this->excerpt);
}
function setExcerpt($text) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-15 11:33:14
|
Revision: 671
http://sciret.svn.sourceforge.net/sciret/?rev=671&view=rev
Author: alpeb
Date: 2008-09-15 11:33:08 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
(by Pawel) Improved some of the templates and styles
Modified Paths:
--------------
trunk/images/arrow_down.png
trunk/images/arrow_up.png
trunk/images/bg_panel.gif
trunk/images/bg_table_head.jpg
trunk/style.css
trunk/templates/AdvancedSearch.tpl
trunk/templates/MainView.tpl
trunk/templates/footer.tpl
trunk/templates/pagination.tpl
Added Paths:
-----------
trunk/images/bg_panel_gray.gif
Property changes on: trunk/images/bg_panel_gray.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/style.css
===================================================================
--- trunk/style.css 2008-09-15 11:31:44 UTC (rev 670)
+++ trunk/style.css 2008-09-15 11:33:08 UTC (rev 671)
@@ -270,6 +270,7 @@
.view_right {
text-align: right;
+ vertical-align: middle;
}
@@ -410,6 +411,25 @@
display: block;
}
+table.categoriesTable {
+ border: 1px solid #cbeaf4;
+ margin-bottom: 20px;
+}
+
+.art_category {
+ color: #5b5b5b;
+ font-size: 11px;
+ margin-top: 5px;
+ text-transform: uppercase;
+ letter-spacing: 2px;
+ font-weight: bold;
+ margin-bottom: 20px;
+}
+
+.art_category a {
+ font-weight: bold;
+}
+
#article p {
margin-bottom: 40px;
}
@@ -421,7 +441,7 @@
margin-left: 680px;
}
-.panel_title {
+.panel_title, .panel_title_gray {
background: url(images/bg_panel_title.gif) no-repeat;
width: 240px;
height: 35px;
@@ -442,6 +462,18 @@
color: #02628d;
}
+.panel_title_gray a {
+ margin-left: 10px;
+ vertical-align: middle;
+ font-weight: normal;
+ font-style: normal;
+ text-decoration: none;
+ line-height: 35px;
+ font-size: 1.5em;
+ color: #3b3b3b;
+}
+
+
.panel {
width: 250px;
margin-top: 20px;
@@ -456,19 +488,42 @@
.panel_bottom {
height: 10px;
margin-top: 0;
- background: url(images/bg_panel.png) no-repeat 0 bottom;
+ background: url(images/bg_panel.gif) no-repeat 0 bottom;
}
+.panel_gray {
+ width: 250px;
+ margin-top: 20px;
+ padding-bottom: 5px;
+ padding-top: 1px;
+ font-weight: normal;
+ background: url(images/bg_panel_gray.gif) no-repeat;
+ font-style: normal;
+}
+
+.panel_bottom_gray {
+ height: 10px;
+ margin-top: 0;
+ background: url(images/bg_panel_gray.gif) no-repeat 0 bottom;
+}
+
hr {
margin-top: 15px;
border: 1px solid #4d8bff;
}
-.inside_panel {
+.inside_panel, .inside_panel_gray {
padding: 0 10px;
}
-.inside_panel ul { padding-left: 2px; }
+.inside_panel_gray {
+ color: #434d5d;
+}
+
+.inside_panel ul, .inside_panel_gray ul {
+ padding-left: 2px;
+}
+
.inside_panel li {
list-style-type: none;
border-bottom: 1px solid #4d8bff;
@@ -481,16 +536,69 @@
background-color: #6cb2f8;
}
+.inside_panel_gray li {
+ list-style-type: none;
+ border-bottom: 1px solid #b0bac6;
+ font-weight: bold;
+ font-size: 1em;
+ padding: 5px 4px;
+}
+
+.inside_panel_gray li:hover {
+ background-color: #b0c7d5;
+}
+
+.inside_panel ol, .inside_panel_gray ol {
+ margin: 0;
+ padding: 0;
+}
+
.inside_panel a {
- color: #004379;
+ color: #004e8c;
font-weight: bold;
- font-size: 1.1em;
+ font-size: 1em;
}
.inside_panel a:hover {
text-decoration: none;
+ color: #2f6fab;
}
+.inside_panel_gray a {
+ color: #3b3b3b;
+ font-weight: bold;
+ font-size: 1.1em;
+}
+
+.inside_panel_gray a:hover {
+ text-decoration: none;
+ color: #53565c;
+}
+
+.inside_panel_gray .category {
+ color: #537386;
+}
+
+.advanced {
+ text-align: right;
+ margin-top: 5px;
+ margin-bottom: 0;
+ padding-top: 5px;
+ border-top: 1px solid #429bea;
+}
+
+.target {
+ margin-top: 5px;
+ margin-bottom: 10px;
+ font-size: 0.8em;
+}
+
+.category {
+ color: #fff;
+ text-transform: uppercase;
+ font-size: 0.8em;
+}
+
.add {
text-align: right;
}
@@ -512,8 +620,14 @@
text-decoration: none;
}
+
+.panel li a {
+ color: #005396;
+ font-weight: bold;
+}
+
+
.input_p {
- margin-bottom: 10px;
background-color: #006dc3;
border-style: none;
padding: 5px;
@@ -522,12 +636,11 @@
}
#query {
- margin-bottom: 10px;
background-color: #006dc3;
border-style: none;
padding: 5px;
color: #fff;
- width: 150px;
+ width: 160px;
float: left;
}
@@ -565,6 +678,7 @@
padding-right:5px;
padding-bottom: 0;
padding-left: 10px;
+ margin-top: 1px;
}
.button_panel a:hover {
@@ -630,14 +744,20 @@
border-spacing:0;
}
+.row_off td {
+ border-style: none;
+}
+
+td {
+ border-style: none;
+}
+
table th {
- border-right: 1px solid #81a1c6;
- border-bottom: 1px solid #81a1c6;
- border-top: 1px solid #81a1c6;
letter-spacing: 1px;
text-align: left;
padding: 4px 4px 4px 8px;
background: url(images/bg_table_head.jpg) no-repeat;
+ border: 1px solid #81a1c6;
}
.specth {
@@ -658,6 +778,39 @@
/* foot */
+#pagination {
+ text-align: center;
+}
+
+#pagination ul {
+ margin-top: 40px;
+}
+
+#pagination li {
+ display: inline;
+}
+
+#pagination a {
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ background-color: #ededed;
+ padding: 4px 8px;
+ color: #566168;
+}
+
+#pagination a:hover {
+ text-decoration: none;
+ background-color: #d1e6f2;
+ color: #67aff5;
+}
+
+.selectedPage {
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ padding: 4px 8px;
+ background-color: #d1e6f2;
+}
+
#foot {
margin-left: auto;
margin-right: auto;
Modified: trunk/templates/AdvancedSearch.tpl
===================================================================
--- trunk/templates/AdvancedSearch.tpl 2008-09-15 11:31:44 UTC (rev 670)
+++ trunk/templates/AdvancedSearch.tpl 2008-09-15 11:33:08 UTC (rev 671)
@@ -12,9 +12,9 @@
<form method="GET" action="{formAction}">
<input type="hidden" name="view" value="SearchResults" />
<input type="hidden" name="advancedSearch" value="1" />
- <table style="border:1px solid black; margin:5px auto">
+ <table>
<tr class=th>
- <td colspan=2 align=center><b>[l]Advanced Search[/l]</b></td>
+ <th colspan=2 >[l]Advanced Search[/l]</th>
</tr>
<tr class="row_off">
<td colspan="2">
@@ -109,7 +109,7 @@
(*): [l]Separate word list with spaces[/l]
</td>
</tr>
- <tr>
+ <tr>
<td colspan=2 align=center style="padding: 10px 0 10px 0">
<input type="submit" name="adv_search" value="[l]Search[/l]">
</td>
Modified: trunk/templates/MainView.tpl
===================================================================
--- trunk/templates/MainView.tpl 2008-09-15 11:31:44 UTC (rev 670)
+++ trunk/templates/MainView.tpl 2008-09-15 11:33:08 UTC (rev 671)
@@ -57,7 +57,7 @@
<div>
{modifOrCreated} {art_date} - {img_stars} {attachment}
</div>
-<div style='font-size:15px;color:green'>{art_category}</div>
+<div class="art_category">{art_category}</div>
<p>{art_excerpt}</p>
<div class="author"><span>{art_author}</span></div>
<!-- END articles_block -->
Modified: trunk/templates/footer.tpl
===================================================================
--- trunk/templates/footer.tpl 2008-09-15 11:31:44 UTC (rev 670)
+++ trunk/templates/footer.tpl 2008-09-15 11:33:08 UTC (rev 671)
@@ -38,11 +38,13 @@
<span class="button_panel">
<a href="javascript:void(0)" onclick="submitSearch()"><span>[l]Search[/l]</span></a>
</span>
- <a href="{advancedSearchLink}">[l]Advanced Search[/l]</a>
- <p><strong>[l]Target[/l]:</strong></p>
+ <p class="target">
+ <strong>[l]Target[/l]:</strong>
<input type="radio" name="set" value="all" {checked_all} />[l]All[/l]
<input type="radio" name="set" value="articles" {checked_articles} />[l]Articles[/l]
- <input type="radio" name="set" value="bookmarks" {checked_bookmarks} />[l]Bookmarks[/l]
+ <input type="radio" name="set" value="bookmarks" {checked_bookmarks} />[l]Bookmarks[/l]
+ </p>
+ <p class="advanced"><a href="{advancedSearchLink}">[l]Advanced Search[/l]</a></p>
</form>
</div>
</div>
@@ -71,51 +73,70 @@
<!-- END todosLink_block -->
<!-- BEGIN latestArts_block -->
- <div class="panel">
- <div class="panel_title"><a href="">[l]Latest[/l]</a></div>
+ <div class="panel_gray">
+ <div class="panel_title_gray"><a href="">[l]Latest[/l]</a></div>
+ <div class="inside_panel_gray">
<ol>
<!-- BEGIN latestArtsItem_block -->
<li>
<a href="{latestLink}">{latestTitle} </a><span style='font-size: 80%'>({latestDate})</span><br>
- <span style='font-size:80%;color:green'>{latestCategory}</span>
+ <span class="category">{latestCategory}</span>
</li>
<!-- END latestArtsItem_block -->
- </ol>
+ </ol>
+ </div>
</div>
- <div class="panel_bottom"></div>
+ <div class="panel_bottom_gray"></div>
<!-- END latestArts_block -->
<!-- BEGIN mostViewedArts_block -->
- <div class="panel">
- <div class="panel_title"><a href="">[l]Most Viewed[/l]</a></div>
- <ol>
+ <div class="panel_gray">
+ <div class="panel_title_gray"><a href="">[l]Most Viewed[/l]</a></div>
+ <div class="inside_panel_gray">
+ <ol>
<!-- BEGIN mostViewedArtsItem_block -->
<li>
<a href="{mostViewedLink}">{mostViewedTitle} </a><span style='font-size: 80%'>({mostViewedViews} [l]views[/l])</span><br>
- <span style='font-size:80%;color:green'>{mostViewedCategory}</span>
+ <span class="category">{mostViewedCategory}</span>
</li>
<!-- END mostViewedArtsItem_block -->
- </ol>
+ </ol>
+ </div>
</div>
- <div class="panel_bottom"></div>
+ <div class="panel_bottom_gray"></div>
<!-- END mostViewedArts_block -->
<!-- BEGIN unansweredQuestions_block -->
- <div class="panel">
- <div class="panel_title"><a href="">[l]Unanswered Questions[/l]</a></div>
- <ul>
+ <div class="panel_gray">
+ <div class="panel_title_gray"><a href="">[l]Unanswered Questions[/l]</a></div>
+ <div class="inside_panel_gray">
+ <ul>
<!-- BEGIN unansweredQuestionsItem_block -->
<li>
{questionSummary} ({questionUserName})
<!-- BEGIN answerLink_block -->
<a href="{answerLink}" style="font-size:10px">[l]answer[/l]</a><br>
<!-- END answerLink_block -->
- <span style='font-size:80%;color:green'>{questionCategory}</span>
+ <span class="category">{questionCategory}</span>
</li>
<!-- END unansweredQuestionsItem_block -->
- </ul>
+ </ul>
+
+ <ul>
+ <!-- BEGIN unansweredQuestionsItem_block -->
+ <li>
+ {questionSummary} ({questionUserName})
+ <!-- BEGIN answerLink_block -->
+ <a href="{answerLink}" style="font-size:10px">[l]answer[/l]</a><br>
+ <!-- END answerLink_block -->
+ <span class="category">{questionCategory}</span>
+ </li>
+ <!-- END unansweredQuestionsItem_block -->
+ </ul>
+ </div>
+
</div>
- <div class="panel_bottom"></div>
+ <div class="panel_bottom_gray"></div>
<!-- END unansweredQuestions_block -->
</div><!--end panel_right-->
Modified: trunk/templates/pagination.tpl
===================================================================
--- trunk/templates/pagination.tpl 2008-09-15 11:31:44 UTC (rev 670)
+++ trunk/templates/pagination.tpl 2008-09-15 11:33:08 UTC (rev 671)
@@ -8,17 +8,16 @@
* @packager Keyboard Monkeys
*/
-->
-
-<div style="text-align:center;">
- <table class="paginationTable" cellpadding="5" cellspacing="3" border="0" style="margin:20px auto">
- <tr>
+
+ <div id="pagination">
+ <ul>
<!-- BEGIN previousPage_block -->
- <td><a href="{previousLink}{linkQuery}" class="previousNext">[l]Previous[/l]</a></td>
+ <li><a href="{previousLink}{linkQuery}" class="previousNext">[l]Previous[/l]</a></li>
<!-- END previousPage_block -->
- <td nowrap="true" >{pageItems}</td>
+ <li nowrap="true" >{pageItems}</li>
<!-- BEGIN nextPage_block -->
- <td><a href="{nextLink}{linkQuery}" class="previousNext">[l]Next[/l]</a></td>
- <!-- END nextPage_block -->
- </tr>
- </table>
-</div>
+ <li><a href="{nextLink}{linkQuery}" class="previousNext">[l]Next[/l]</a></li>
+ <!-- END nextPage_block -->
+ <ul>
+ </div>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-15 11:31:48
|
Revision: 670
http://sciret.svn.sourceforge.net/sciret/?rev=670&view=rev
Author: alpeb
Date: 2008-09-15 11:31:44 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
added some logic to handle scenario when some preferences haven't been set
Modified Paths:
--------------
trunk/models/User.php
trunk/models/Users.php
Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php 2008-09-15 11:15:00 UTC (rev 669)
+++ trunk/models/User.php 2008-09-15 11:31:44 UTC (rev 670)
@@ -46,12 +46,16 @@
private function _initPreferencesArr($preferences)
{
+ $defaultPreferences = Users::$preferences;
$this->_preferencesArr = unserialize($preferences);
if ($this->_preferencesArr['language'] == '') {
$this->_preferencesArr['language'] = Zend_Registry::get('config')->general->language_default;
}
+ if (!isset($this->_preferencesArr['startBrowsing'])) {
+ $this->_preferencesArr['startBrowsing'] = $defaultPreferences['startBrowsing'];
+ }
if (!isset($this->_preferencesArr['hiddenCategories'])) {
- $this->_preferencesArr['hiddenCategories'] = '';
+ $this->_preferencesArr['hiddenCategories'] = $defaultPreferences['hiddenCategories'];
}
}
Modified: trunk/models/Users.php
===================================================================
--- trunk/models/Users.php 2008-09-15 11:15:00 UTC (rev 669)
+++ trunk/models/Users.php 2008-09-15 11:31:44 UTC (rev 670)
@@ -6,21 +6,22 @@
protected $_primary = 'id';
protected $_rowClass = 'User';
+ public static $preferences = array(
+ 'startBrowsing' => 'all',
+ 'articlesPerPage' => 10,
+ 'dateFormat' => 'Month Day, Year',
+ 'language' => '', // set in the constructor
+ 'navigationType' => 'catAndSubCats',
+ 'hiddenCategories' => '',
+ );
+
public function createRow()
{
- $preferences = array(
- 'startBrowsing' => 'all',
- 'articlesPerPage' => 10,
- 'dateFormat' => 'Month Day, Year',
- 'language' => '', // set in the constructor
- 'navigationType' => 'catAndSubCats',
- 'hiddenCategories' => '',
- );
return parent::createRow(array(
'password_changed' => '0000-00-00',
'admin' => 0,
- 'preferences' => serialize($preferences),
+ 'preferences' => serialize(self::$preferences),
));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-15 11:15:04
|
Revision: 669
http://sciret.svn.sourceforge.net/sciret/?rev=669&view=rev
Author: alpeb
Date: 2008-09-15 11:15:00 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
added some logic to handle scenario when some preferences haven't been set
Modified Paths:
--------------
trunk/models/User.php
Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php 2008-09-07 21:03:45 UTC (rev 668)
+++ trunk/models/User.php 2008-09-15 11:15:00 UTC (rev 669)
@@ -50,6 +50,9 @@
if ($this->_preferencesArr['language'] == '') {
$this->_preferencesArr['language'] = Zend_Registry::get('config')->general->language_default;
}
+ if (!isset($this->_preferencesArr['hiddenCategories'])) {
+ $this->_preferencesArr['hiddenCategories'] = '';
+ }
}
public function __get($name)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-07 21:03:49
|
Revision: 668
http://sciret.svn.sourceforge.net/sciret/?rev=668&view=rev
Author: alpeb
Date: 2008-09-07 21:03:45 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
little bug
Modified Paths:
--------------
trunk/actions/EditUser.php
Modified: trunk/actions/EditUser.php
===================================================================
--- trunk/actions/EditUser.php 2008-09-02 22:50:31 UTC (rev 667)
+++ trunk/actions/EditUser.php 2008-09-07 21:03:45 UTC (rev 668)
@@ -73,7 +73,7 @@
if (
$user->isPasswordExpired($this->configuration->getConfigValue('passwordExpirationDays'))
- && $user->getPassword() == md5($_POST['password'])
+ && $user->password == md5($_POST['password'])
)
{
$_SESSION['message'] = $this->user->lang('Your password has expired. Please change it below.');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-02 22:50:42
|
Revision: 667
http://sciret.svn.sourceforge.net/sciret/?rev=667&view=rev
Author: alpeb
Date: 2008-09-02 22:50:31 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
added mock db class to pass on to the Users gateway when wanting to build user objects that are not connected to the db
Modified Paths:
--------------
trunk/index.php
trunk/models/User.php
Added Paths:
-----------
trunk/models/SciretMockDb.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-09-02 21:47:53 UTC (rev 666)
+++ trunk/index.php 2008-09-02 22:50:31 UTC (rev 667)
@@ -95,8 +95,8 @@
Zend_Session::start();
$auth = Zend_Auth::getInstance();
-$users = new Users();
if ($auth->hasIdentity()) {
+ $users = new Users();
$user = $auth->getStorage()->read();
$user->init();
if ($user->app == 'monkeys') {
@@ -109,7 +109,11 @@
// reactivate row as live data
$user->setTable($users);
} else {
- // guest user
+ // guest user.
+ // Using mock db because the anonymous user object shouldn't interact with the db
+ // and there even isn't a db around when installing the app.
+ $mockDb = new SciretMockDb();
+ $users = new Users($mockDb);
$user = $users->createRow();
}
Added: trunk/models/SciretMockDb.php
===================================================================
--- trunk/models/SciretMockDb.php (rev 0)
+++ trunk/models/SciretMockDb.php 2008-09-02 22:50:31 UTC (rev 667)
@@ -0,0 +1,59 @@
+<?php
+
+class SciretMockDb extends Zend_Db_Adapter_Abstract
+{
+ public function __construct($config = false)
+ {
+ }
+
+ public function listTables()
+ {
+ }
+
+ public function describeTable($tableName, $schemaName = null)
+ {
+ if ($tableName == 'users') {
+ return User::$tableDefinition;
+ }
+ }
+
+ protected function _connect()
+ {
+ }
+
+ public function closeConnection()
+ {
+ }
+
+ public function prepare($sql)
+ {
+ }
+
+ public function lastInsertId($tableName = null, $primaryKey = null)
+ {
+ }
+
+ protected function _beginTransaction()
+ {
+ }
+
+ protected function _commit()
+ {
+ }
+
+ protected function _rollBack()
+ {
+ }
+
+ public function setFetchMode($mode)
+ {
+ }
+
+ public function limit($sql, $count, $offset = 0)
+ {
+ }
+
+ public function supportsParameters($type)
+ {
+ }
+}
Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php 2008-09-02 21:47:53 UTC (rev 666)
+++ trunk/models/User.php 2008-09-02 22:50:31 UTC (rev 667)
@@ -289,4 +289,151 @@
return ($passwordAge > $expirationDays);
}
+
+ public static $tableDefinition = array(
+ 'id' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'id',
+ 'COLUMN_POSITION' => 1,
+ 'DATA_TYPE' => 'int',
+ 'DEFAULT' => NULL,
+ 'NULLABLE' => false,
+ 'LENGTH' => NULL,
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => true,
+ 'PRIMARY_POSITION' => 1,
+ 'IDENTITY' => true,
+ ),
+ 'firstname' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'firstname',
+ 'COLUMN_POSITION' => 2,
+ 'DATA_TYPE' => 'varchar',
+ 'DEFAULT' => '',
+ 'NULLABLE' => false,
+ 'LENGTH' => '50',
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'lastname' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'lastname',
+ 'COLUMN_POSITION' => 3,
+ 'DATA_TYPE' => 'varchar',
+ 'DEFAULT' => '',
+ 'NULLABLE' => false,
+ 'LENGTH' => '50',
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'username' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'username',
+ 'COLUMN_POSITION' => 4,
+ 'DATA_TYPE' => 'varchar',
+ 'DEFAULT' => '',
+ 'NULLABLE' => false,
+ 'LENGTH' => '50',
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'email' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'email',
+ 'COLUMN_POSITION' => 5,
+ 'DATA_TYPE' => 'varchar',
+ 'DEFAULT' => '',
+ 'NULLABLE' => false,
+ 'LENGTH' => '100',
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'password' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'password',
+ 'COLUMN_POSITION' => 6,
+ 'DATA_TYPE' => 'varchar',
+ 'DEFAULT' => '',
+ 'NULLABLE' => false,
+ 'LENGTH' => '32',
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'password_changed' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'password_changed',
+ 'COLUMN_POSITION' => 7,
+ 'DATA_TYPE' => 'date',
+ 'DEFAULT' => NULL,
+ 'NULLABLE' => false,
+ 'LENGTH' => NULL,
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'admin' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'admin',
+ 'COLUMN_POSITION' => 8,
+ 'DATA_TYPE' => 'tinyint',
+ 'DEFAULT' => '0',
+ 'NULLABLE' => false,
+ 'LENGTH' => NULL,
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ 'preferences' => array (
+ 'SCHEMA_NAME' => NULL,
+ 'TABLE_NAME' => 'users',
+ 'COLUMN_NAME' => 'preferences',
+ 'COLUMN_POSITION' => 9,
+ 'DATA_TYPE' => 'text',
+ 'DEFAULT' => NULL,
+ 'NULLABLE' => false,
+ 'LENGTH' => NULL,
+ 'SCALE' => NULL,
+ 'PRECISION' => NULL,
+ 'UNSIGNED' => NULL,
+ 'PRIMARY' => false,
+ 'PRIMARY_POSITION' => NULL,
+ 'IDENTITY' => false,
+ ),
+ );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-02 21:48:01
|
Revision: 666
http://sciret.svn.sourceforge.net/sciret/?rev=666&view=rev
Author: alpeb
Date: 2008-09-02 21:47:53 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
reverted previous commit. That didn't work out
Modified Paths:
--------------
trunk/index.php
trunk/models/User.php
trunk/models/Users.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-09-02 20:56:40 UTC (rev 665)
+++ trunk/index.php 2008-09-02 21:47:53 UTC (rev 666)
@@ -95,8 +95,8 @@
Zend_Session::start();
$auth = Zend_Auth::getInstance();
+$users = new Users();
if ($auth->hasIdentity()) {
- $users = new Users();
$user = $auth->getStorage()->read();
$user->init();
if ($user->app == 'monkeys') {
@@ -110,7 +110,7 @@
$user->setTable($users);
} else {
// guest user
- $user = new User();
+ $user = $users->createRow();
}
Zend_Registry::set('user', $user);
Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php 2008-09-02 20:56:40 UTC (rev 665)
+++ trunk/models/User.php 2008-09-02 21:47:53 UTC (rev 666)
@@ -21,30 +21,6 @@
public $app = 'sciret';
public $publicId;
- /**
- * These are here to be able to have default values when instantiating
- * an anonymous User object without having a connection to the DB
- * (during install)
- */
- public $id = 0;
- public $admin = 0;
- public $password_changed = '0000-00-00';
- public $startBrowsing = 'all';
- public $articlesPerPage = 10;
- public $dateFormat = 'Month Day, Year';
- public $language = '';
- public $navigationType = 'catAndSubCats';
- public $hiddenCategories = '';
- public $preferences;
- private $_defaultPreferences = array(
- 'startBrowsing' => 'all',
- 'articlesPerPage' => 10,
- 'dateFormat' => 'Month Day, Year',
- 'language' => '', // set in the constructor
- 'navigationType' => 'catAndSubCats',
- 'hiddenCategories' => '',
- );
-
var $langArr;
var $skipTranslations = false;
var $rtlLanguages = array('Hebrew');
@@ -53,12 +29,6 @@
private $_preferencesArr;
- public function __construct($config = array())
- {
- $this->preferences = serialize($this->_defaultPreferences);
- parent::__construct($config);
- }
-
public function init()
{
if ($this->id) {
Modified: trunk/models/Users.php
===================================================================
--- trunk/models/Users.php 2008-09-02 20:56:40 UTC (rev 665)
+++ trunk/models/Users.php 2008-09-02 21:47:53 UTC (rev 666)
@@ -8,14 +8,19 @@
public function createRow()
{
- /**
- * we instantiate an anonymous user obj just to get the default field values
- */
- $user = new User();
+ $preferences = array(
+ 'startBrowsing' => 'all',
+ 'articlesPerPage' => 10,
+ 'dateFormat' => 'Month Day, Year',
+ 'language' => '', // set in the constructor
+ 'navigationType' => 'catAndSubCats',
+ 'hiddenCategories' => '',
+ );
+
return parent::createRow(array(
- 'password_changed' => $user->password_changed,
- 'admin' => $user->admin,
- 'preferences' => $user->preferences,
+ 'password_changed' => '0000-00-00',
+ 'admin' => 0,
+ 'preferences' => serialize($preferences),
));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-02 20:56:52
|
Revision: 665
http://sciret.svn.sourceforge.net/sciret/?rev=665&view=rev
Author: alpeb
Date: 2008-09-02 20:56:40 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
some workarounds to be able to instantiate an anonoymous user obj without having a connection to the db (bypassing the Users gateway class). Used during install
Modified Paths:
--------------
trunk/index.php
trunk/models/User.php
trunk/models/Users.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-09-02 20:55:01 UTC (rev 664)
+++ trunk/index.php 2008-09-02 20:56:40 UTC (rev 665)
@@ -95,8 +95,8 @@
Zend_Session::start();
$auth = Zend_Auth::getInstance();
-$users = new Users();
if ($auth->hasIdentity()) {
+ $users = new Users();
$user = $auth->getStorage()->read();
$user->init();
if ($user->app == 'monkeys') {
@@ -110,7 +110,7 @@
$user->setTable($users);
} else {
// guest user
- $user = $users->createRow();
+ $user = new User();
}
Zend_Registry::set('user', $user);
Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php 2008-09-02 20:55:01 UTC (rev 664)
+++ trunk/models/User.php 2008-09-02 20:56:40 UTC (rev 665)
@@ -21,6 +21,30 @@
public $app = 'sciret';
public $publicId;
+ /**
+ * These are here to be able to have default values when instantiating
+ * an anonymous User object without having a connection to the DB
+ * (during install)
+ */
+ public $id = 0;
+ public $admin = 0;
+ public $password_changed = '0000-00-00';
+ public $startBrowsing = 'all';
+ public $articlesPerPage = 10;
+ public $dateFormat = 'Month Day, Year';
+ public $language = '';
+ public $navigationType = 'catAndSubCats';
+ public $hiddenCategories = '';
+ public $preferences;
+ private $_defaultPreferences = array(
+ 'startBrowsing' => 'all',
+ 'articlesPerPage' => 10,
+ 'dateFormat' => 'Month Day, Year',
+ 'language' => '', // set in the constructor
+ 'navigationType' => 'catAndSubCats',
+ 'hiddenCategories' => '',
+ );
+
var $langArr;
var $skipTranslations = false;
var $rtlLanguages = array('Hebrew');
@@ -29,6 +53,12 @@
private $_preferencesArr;
+ public function __construct($config = array())
+ {
+ $this->preferences = serialize($this->_defaultPreferences);
+ parent::__construct($config);
+ }
+
public function init()
{
if ($this->id) {
Modified: trunk/models/Users.php
===================================================================
--- trunk/models/Users.php 2008-09-02 20:55:01 UTC (rev 664)
+++ trunk/models/Users.php 2008-09-02 20:56:40 UTC (rev 665)
@@ -8,19 +8,14 @@
public function createRow()
{
- $preferences = array(
- 'startBrowsing' => 'all',
- 'articlesPerPage' => 10,
- 'dateFormat' => 'Month Day, Year',
- 'language' => '', // set in the constructor
- 'navigationType' => 'catAndSubCats',
- 'hiddenCategories' => '',
- );
-
+ /**
+ * we instantiate an anonymous user obj just to get the default field values
+ */
+ $user = new User();
return parent::createRow(array(
- 'password_changed' => '0000-00-00',
- 'admin' => 0,
- 'preferences' => serialize($preferences),
+ 'password_changed' => $user->password_changed,
+ 'admin' => $user->admin,
+ 'preferences' => $user->preferences,
));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-09-02 20:55:11
|
Revision: 664
http://sciret.svn.sourceforge.net/sciret/?rev=664&view=rev
Author: alpeb
Date: 2008-09-02 20:55:01 +0000 (Tue, 02 Sep 2008)
Log Message:
-----------
default to production true
Modified Paths:
--------------
trunk/config.ini.php.template
Modified: trunk/config.ini.php.template
===================================================================
--- trunk/config.ini.php.template 2008-08-28 21:35:33 UTC (rev 663)
+++ trunk/config.ini.php.template 2008-09-02 20:55:01 UTC (rev 664)
@@ -4,7 +4,7 @@
'environment' =>
array (
'session_name' => 'SCIRET',
- 'production' => false,
+ 'production' => true,
'loglevel' => 0,
),
'general' =>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-08-28 21:35:36
|
Revision: 663
http://sciret.svn.sourceforge.net/sciret/?rev=663&view=rev
Author: alpeb
Date: 2008-08-28 21:35:33 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
corrected spelling in logo
Modified Paths:
--------------
trunk/images/logo.jpg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-08-28 21:03:53
|
Revision: 662
http://sciret.svn.sourceforge.net/sciret/?rev=662&view=rev
Author: alpeb
Date: 2008-08-28 21:03:51 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
implemented Zend_Db_Table and Zend_Db_Table_Row classes for the user and user gateway classes. Also some coding standards changes
Added Paths:
-----------
trunk/models/SciretTableGateway.php
Added: trunk/models/SciretTableGateway.php
===================================================================
--- trunk/models/SciretTableGateway.php (rev 0)
+++ trunk/models/SciretTableGateway.php 2008-08-28 21:03:51 UTC (rev 662)
@@ -0,0 +1,10 @@
+<?php
+
+abstract class SciretTableGateway extends Zend_Db_Table_Abstract
+{
+ public function getRowInstance($id)
+ {
+ return $this->fetchRow($this->select()->where('id = ?', $id));
+ }
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-08-28 20:59:23
|
Revision: 661
http://sciret.svn.sourceforge.net/sciret/?rev=661&view=rev
Author: alpeb
Date: 2008-08-28 20:59:20 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
removed bad link
Modified Paths:
--------------
trunk/templates/ViewArticle.tpl
Modified: trunk/templates/ViewArticle.tpl
===================================================================
--- trunk/templates/ViewArticle.tpl 2008-08-28 20:52:12 UTC (rev 660)
+++ trunk/templates/ViewArticle.tpl 2008-08-28 20:59:20 UTC (rev 661)
@@ -64,7 +64,7 @@
</div>
<div id="tab_article" class="tab">
<h2>
- <a href="knowladge_article.html">{title}</a>
+ <a href="">{title}</a>
</h2>
<p>{content}</p>
<div id="commentsDiv">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-08-28 20:52:17
|
Revision: 660
http://sciret.svn.sourceforge.net/sciret/?rev=660&view=rev
Author: alpeb
Date: 2008-08-28 20:52:12 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
implemented Zend_Db_Table and Zend_Db_Table_Row classes for the user and user gateway classes. Also some coding standards changes
Modified Paths:
--------------
trunk/actions/CompleteTodo.php
trunk/actions/DeleteArticle.php
trunk/actions/DeleteTodo.php
trunk/actions/DeleteUser.php
trunk/actions/EditUser.php
trunk/actions/Login.php
trunk/actions/Logout.php
trunk/actions/MarkArticle.php
trunk/actions/MarkLocation.php
trunk/actions/MarkSearchResults.php
trunk/actions/SaveArticle.php
trunk/actions/SaveBookmark.php
trunk/actions/SaveTodo.php
trunk/actions/Upgrade.php
trunk/classes/Controller.php
trunk/index.php
trunk/models/Article.php
trunk/models/User.php
trunk/templates/EditBookmark.tpl
trunk/views/EditArticle.php
trunk/views/EditPreferences.php
trunk/views/EditTodo.php
trunk/views/EditUser.php
trunk/views/GetFavoritesDropdown.php
trunk/views/GetTodosDropdown.php
trunk/views/MainView.php
trunk/views/ManageArticles.php
trunk/views/ManageUsers.php
trunk/views/SearchResults.php
trunk/views/View.php
trunk/views/ViewArticle.php
trunk/views/ViewBookmark.php
Added Paths:
-----------
trunk/models/Users.php
Removed Paths:
-------------
trunk/models/UserGateway.php
Modified: trunk/actions/CompleteTodo.php
===================================================================
--- trunk/actions/CompleteTodo.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/CompleteTodo.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -16,7 +16,7 @@
function dispatch() {
$todo = new Todo($_POST['todoId']);
- if ($todo->getUserId() != $this->user->getId()) {
+ if ($todo->getUserId() != $this->user->id) {
echo 'FAILURE|' . $this->user->lang('Cannot complete other people\'s todo\'s');
exit;
}
Modified: trunk/actions/DeleteArticle.php
===================================================================
--- trunk/actions/DeleteArticle.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/DeleteArticle.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,18 +9,17 @@
* @packager Keyboard Monkeys
*/
-require 'actions/Action.php';
-require 'models/ArticleGateway.php';
+class DeleteArticle extends Action
+{
-class DeleteArticle extends Action {
-
- function dispatch() {
+ function dispatch()
+ {
$artId = isset($_GET['id'])? (int)$_GET['id'] : 0;
if ($this->configuration->getConfigValue('restrictEditDelete')) {
$article = new Article($artId);
- if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & User::ROLE_ADMIN) != User::ROLE_ADMIN) {
+ if ($article->getUserId() != $this->user->id && ($this->user->role & User::ROLE_ADMIN) != User::ROLE_ADMIN) {
$_SESSION['message'] = $this->user->lang('Sorry, only the author or an admin can delete this article.');
Library::redirect(Library::getLink(array('view' => 'ViewArticle', 'id' => $artId)));
}
@@ -38,4 +37,3 @@
}
}
-?>
Modified: trunk/actions/DeleteTodo.php
===================================================================
--- trunk/actions/DeleteTodo.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/DeleteTodo.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -16,7 +16,7 @@
function dispatch() {
$todoGateway = new TodoGateway;
- if ($todoGateway->deleteTodo($_POST['todoId'], $this->user->getId())) {
+ if ($todoGateway->deleteTodo($_POST['todoId'], $this->user->id)) {
echo 'OK';
} else {
echo 'FAILURE';
Modified: trunk/actions/DeleteUser.php
===================================================================
--- trunk/actions/DeleteUser.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/DeleteUser.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,11 +9,8 @@
* @packager Keyboard Monkeys
*/
-require 'actions/Action.php';
-require_once 'models/UserGateway.php';
-
-class DeleteUser extends Action {
-
+class DeleteUser extends Action
+{
function dispatch() {
$userId = isset($_GET['userId'])? (int)$_GET['userId'] : 0;
@@ -21,12 +18,10 @@
die($this->user->lang('You can\'t delete the main administrator user.'));
}
- $userGateway = new UserGateway;
- $userGateway->deleteUser($userId);
+ $users = new Users();
+ $users->deleteUser($userId);
$_SESSION['message'] = $this->user->lang('User deleted successfully');
Library::redirect(Library::getLink(array('view' => 'ManageUsers')));
}
}
-
-?>
Modified: trunk/actions/EditUser.php
===================================================================
--- trunk/actions/EditUser.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/EditUser.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,23 +9,22 @@
* @packager Keyboard Monkeys
*/
-require 'actions/Action.php';
-require_once 'models/User.php';
+class EditUser extends Action
+{
-class EditUser extends Action {
-
- function dispatch() {
-
+ function dispatch()
+ {
// security check
- if (!$this->user->isAdmin() && $this->user->getId() != $_POST['userId']) {
+ if (!$this->user->isAdmin() && $this->user->id != $_POST['userId']) {
$_SESSION['message'] = $this->user->lang('What are you trying to do??');
Library::redirect(Library::getLink(array('view' => 'Login')));
}
$userId = (int)$_POST['userId'];
- $user = new User($userId);
+ $users = new Users();
- if (!$user->getId()) {
+ if (!$userId) {
+ $user = $users->createRow();
$missingFieldsArr = array();
if ($_POST['firstName'] == '') {
$missingFieldsArr[] = $this->user->lang('First Name');
@@ -70,6 +69,7 @@
}
} else {
+ $user = $users->getRowInstance($userId);
if (
$user->isPasswordExpired($this->configuration->getConfigValue('passwordExpirationDays'))
@@ -77,26 +77,26 @@
)
{
$_SESSION['message'] = $this->user->lang('Your password has expired. Please change it below.');
- Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())));
+ Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->id)));
}
if ($_POST['password'] != $_POST['password2']) {
$_SESSION['message'] = $this->user->lang('Password and Repeat Password fields don\'t match');
- Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())));
- } elseif (!$user->changePassword($_POST['password'])) {
+ Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->id)));
+ } elseif ($_POST['password'] != '' && !$user->changePassword($_POST['password'])) {
$_SESSION['message'] = $this->user->lang('Invalid password. Please don\'t use any of these characters: %s', implode(', ', $user->getDisallowedPasswordChars()));
- Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())));
+ Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->id)));
}
}
- $user->setFirstName($_POST['firstName']);
- $user->setLastName($_POST['lastName']);
- $user->setUserName($_POST['userName']);
- $user->setEmail($_POST['email']);
+ $user->firstname = $_POST['firstName'];
+ $user->lastname = $_POST['lastName'];
+ $user->username = $_POST['userName'];
+ $user->email = $_POST['email'];
$user->setAdmin($this->user->isAdmin() && isset($_POST['adminAccess']));
$user->save();
- if (!$user->getId()) {
+ if (!$user->id) {
$_SESSION['message'] = $this->user->lang('User added successfully');
} else {
$_SESSION['message'] = $this->user->lang('User edited successfully');
@@ -105,9 +105,7 @@
if ($this->user->isAdmin()) {
Library::redirect(Library::getLink(array('view' => 'ManageUsers')));
} else {
- Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())));
+ Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->id)));
}
}
}
-
-?>
Modified: trunk/actions/Login.php
===================================================================
--- trunk/actions/Login.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/Login.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,9 +9,10 @@
* @packager Keyboard Monkeys
*/
-class Login extends Action {
-
- function dispatch() {
+class Login extends Action
+{
+ function dispatch()
+ {
$auth = Zend_Auth::getInstance();
$db = Zend_Db::factory(Zend_Registry::get('config')->database);
$authAdapter = new Zend_Auth_Adapter_DbTable($db, 'users', 'username', 'password', 'MD5(?)');
@@ -19,7 +20,8 @@
->setCredential($_POST['password']);
$result = $auth->authenticate($authAdapter);
if ($result->isValid()) {
- $user = UserGateway::getValidatedUser($_POST['username'], $_POST['password'], $this->configuration);
+ $users = new Users();
+ $user = $users->getUserGivenUsername($_POST['username']);
$auth->getStorage()->write($user);
} else {
$_SESSION['message'] = $this->user->lang('Wrong Username or Password');
@@ -28,11 +30,9 @@
if ($user->isPasswordExpired($this->configuration->getConfigValue('passwordExpirationDays'))) {
$_SESSION['message'] = $this->user->lang('Your password has expired. Please change it below.');
- Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())));
+ Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->id)));
}
Library::redirect(Library::getLink(array('view' => 'MainView')));
}
}
-
-?>
Modified: trunk/actions/Logout.php
===================================================================
--- trunk/actions/Logout.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/Logout.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -11,12 +11,11 @@
require 'actions/Action.php';
-class Logout extends Action {
-
- function dispatch() {
+class Logout extends Action
+{
+ function dispatch()
+ {
Zend_Auth::getInstance()->clearIdentity();
Library::Redirect(Library::getLink(array('view' => 'MainView')));
}
}
-
-?>
Modified: trunk/actions/MarkArticle.php
===================================================================
--- trunk/actions/MarkArticle.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/MarkArticle.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -18,20 +18,20 @@
$favoriteGateway = new FavoriteGateway;
if ($_POST['favorite'] == 1) {
- if ($favoriteGateway->isArticleFavorite($_POST['artId'], $this->user->getId())) {
+ if ($favoriteGateway->isArticleFavorite($_POST['artId'], $this->user->id)) {
echo 'DUPLICATE|foo';
return;
}
$favorite = new Favorite;
- $favorite->setUserId($this->user->getId());
+ $favorite->setUserId($this->user->id);
$favorite->setType(FAVORITE_TYPE_ARTICLE);
$favorite->setArtId($_POST['artId']);
$favorite->save();
echo 'FAVORITE OK|' . $this->user->lang('Article has been added to favorites successfully');;
} else {
- $favoriteGateway->deleteArticleFavorite($_POST['artId'], $this->user->getId());
+ $favoriteGateway->deleteArticleFavorite($_POST['artId'], $this->user->id);
echo 'UNFAVORITE OK|' . $this->user->lang('Article has been removed from favorites successfully');;
}
Modified: trunk/actions/MarkLocation.php
===================================================================
--- trunk/actions/MarkLocation.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/MarkLocation.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -18,20 +18,20 @@
$favoriteGateway = new FavoriteGateway;
if ($_POST['favorite'] == 1) {
- if ($favoriteGateway->isLocationFavorite($_POST['catId'], $this->user->getId())) {
+ if ($favoriteGateway->isLocationFavorite($_POST['catId'], $this->user->id)) {
echo 'DUPLICATE|foo';
return;
}
$favorite = new Favorite;
- $favorite->setUserId($this->user->getId());
+ $favorite->setUserId($this->user->id);
$favorite->setType(FAVORITE_TYPE_LOCATION);
$favorite->setCatId($_POST['catId']);
$favorite->save();
echo 'FAVORITE OK|' . $this->user->lang('Location has been added to favorites successfully');;
} else {
- $favoriteGateway->deleteLocationFavorite($_POST['catId'], $this->user->getId());
+ $favoriteGateway->deleteLocationFavorite($_POST['catId'], $this->user->id);
echo 'UNFAVORITE OK|' . $this->user->lang('Location has been removed from favorites successfully');;
}
Modified: trunk/actions/MarkSearchResults.php
===================================================================
--- trunk/actions/MarkSearchResults.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/MarkSearchResults.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -18,20 +18,20 @@
$favoriteGateway = new FavoriteGateway;
if ($_POST['favorite'] == 1) {
- if ($favoriteGateway->isSearchResultFavorite($_POST['query'], $this->user->getId())) {
+ if ($favoriteGateway->isSearchResultFavorite($_POST['query'], $this->user->id)) {
echo 'DUPLICATE|foo';
return;
}
$favorite = new Favorite;
- $favorite->setUserId($this->user->getId());
+ $favorite->setUserId($this->user->id);
$favorite->setType(FAVORITE_TYPE_SEARCHRESULT);
$favorite->setSearchStr($_POST['query']);
$favorite->save();
echo 'FAVORITE OK|' . $this->user->lang('Search has been added to favorites successfully');
} else {
- $favoriteGateway->deleteSearchResultFavorite($_POST['query'], $this->user->getId());
+ $favoriteGateway->deleteSearchResultFavorite($_POST['query'], $this->user->id);
echo 'UNFAVORITE OK|' . $this->user->lang('Search has been removed from favorites successfully');
}
Modified: trunk/actions/SaveArticle.php
===================================================================
--- trunk/actions/SaveArticle.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/SaveArticle.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -20,7 +20,7 @@
if ($articleId > 0 && $this->configuration->getConfigValue('restrictEditDelete')) {
$article = new Article($articleId);
- if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & User::ROLE_ADMIN) != User::ROLE_ADMIN) {
+ if ($article->getUserId() != $this->user->id && ($this->user->role & User::ROLE_ADMIN) != User::ROLE_ADMIN) {
$_SESSION['message'] = $this->user->lang('Sorry, only the author or an admin can modify this article.');
Library::redirect(Library::getLink(array('view' => 'ViewArticle', 'id' => $articleId)));
}
@@ -51,11 +51,11 @@
if ($articleId > 0) {
$art->setModificationDate(date('Y-m-d H:i:s'));
- $art->setModifiedByUserId($this->user->getId());
+ $art->setModifiedByUserId($this->user->id);
$historyMessage = $this->user->lang('Article modified');
} else {
$art->setPublished($this->configuration->getConfigValue('publishArticlesAuto') == '1'? true : false);
- $art->setUserId($this->user->getId());
+ $art->setUserId($this->user->id);
$historyMessage = $this->user->lang('Article created');
if (isset($_POST['questionID'])) {
@@ -74,7 +74,7 @@
require_once 'models/Todo.php';
$todo = new Todo();
- $todo->setUserId($this->user->getId());
+ $todo->setUserId($this->user->id);
$todo->setTitle($_POST['title']);
$todo->setStatus(TODO_STATUS_PENDING);
$todo->setPrivate(true);
Modified: trunk/actions/SaveBookmark.php
===================================================================
--- trunk/actions/SaveBookmark.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/SaveBookmark.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -32,12 +32,12 @@
if ($bookmarkId > 0) {
$art->setModificationDate(date('Y-m-d H:i:s'));
- $art->setModifiedByUserId($this->user->getId());
+ $art->setModifiedByUserId($this->user->id);
$historyMessage = $this->user->lang('Bookmark modified');
} else {
$art->setPublished($this->configuration->getConfigValue('publishBookmarksAuto') == '1'? true : false);
$art->setDraft($_POST['draft']);
- $art->setUserId($this->user->getId());
+ $art->setUserId($this->user->id);
$historyMessage = $this->user->lang('Bookmark created');
}
$art->save();
@@ -48,7 +48,7 @@
require_once 'models/Todo.php';
$todo = new Todo();
- $todo->setUserId($this->user->getId());
+ $todo->setUserId($this->user->id);
$todo->setTitle($_POST['name']);
$todo->setStatus(TODO_STATUS_PENDING);
$todo->setPrivate(true);
Modified: trunk/actions/SaveTodo.php
===================================================================
--- trunk/actions/SaveTodo.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/SaveTodo.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -19,11 +19,11 @@
$todo = new Todo($todoId);
- if ($todoId && $todo->getUserId() != $this->user->getId()) {
+ if ($todoId && $todo->getUserId() != $this->user->id) {
die('You don\'t have permission to edit this To-Do');
}
- $todo->setUserId($this->user->getId());
+ $todo->setUserId($this->user->id);
$todo->setTitle($_POST['title']);
$todo->setContent($_POST['content']);
$todo->setStatus(isset($_POST['completed'])? TODO_STATUS_COMPLETED : TODO_STATUS_PENDING);
Modified: trunk/actions/Upgrade.php
===================================================================
--- trunk/actions/Upgrade.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/actions/Upgrade.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,15 +9,13 @@
* @packager Keyboard Monkeys
*/
-require 'actions/Action.php';
+class Upgrade extends Action
+{
+ var $users;
-class Upgrade extends Action {
- var $userGateway;
-
function dispatch() {
- require 'models/UserGateway.php';
- $this->userGateway = new UserGateway;
- if (!($user = $this->userGateway->getValidatedUser($_POST['username'], $_POST['password'], $this->configuration)) || !$user->isAdmin()) {
+ $this->users = new Users();
+ if (!($user = $this->users->getValidatedUser($_POST['username'], $_POST['password'], $this->configuration)) || !$user->isAdmin()) {
$_SESSION['message'] = $this->user->lang('Wrong Username or Password');
Library::redirect(Library::getLink(array('view' => 'Upgrade')));
}
@@ -57,7 +55,7 @@
$queries = file($fileName);
foreach ($queries as $query) {
if (trim($query) != '') {
- $this->userGateway->db->query($query); // unorthodox?
+ DB::getInstance()->query($query);
}
}
}
Modified: trunk/classes/Controller.php
===================================================================
--- trunk/classes/Controller.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/classes/Controller.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -56,10 +56,10 @@
if (
// user hasn't got enough privileges
- (($this->user->getRole() & $this->views[$view][MINIMUM_ROLE]) != $this->views[$view][MINIMUM_ROLE])
+ (($this->user->role & $this->views[$view][MINIMUM_ROLE]) != $this->views[$view][MINIMUM_ROLE])
// or user is anonymous and KB is not public
- || ($this->user->getRole() == User::ROLE_ANONYMOUS && $this->views[$view][ALLOW_VIEW_ONLY_IF_PUBLIC_KB] && !$this->configuration->getConfigValue('publishKB'))
+ || ($this->user->role == User::ROLE_ANONYMOUS && $this->views[$view][ALLOW_VIEW_ONLY_IF_PUBLIC_KB] && !$this->configuration->getConfigValue('publishKB'))
)
{
Library::redirect(Library::getLink(array('view' => 'Login')));
@@ -87,7 +87,7 @@
$this->user->setSkipTranslations(true);
}
- if (($this->user->getRole() & $this->actions[$action][MINIMUM_ROLE]) != $this->actions[$action][MINIMUM_ROLE]) {
+ if (($this->user->role & $this->actions[$action][MINIMUM_ROLE]) != $this->actions[$action][MINIMUM_ROLE]) {
Library::redirect(Library::getLink(array('view' => 'Login')));
}
require "actions/$action.php";
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/index.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -74,6 +74,7 @@
$profiler = new DBProfiler();
$db->setProfiler($profiler);
}
+Zend_Db_Table_Abstract::setDefaultAdapter($db);
$connectionFailed = false;
try {
$db->getConnection();
@@ -94,18 +95,22 @@
Zend_Session::start();
$auth = Zend_Auth::getInstance();
+$users = new Users();
if ($auth->hasIdentity()) {
$user = $auth->getStorage()->read();
$user->init();
if ($user->app == 'monkeys') {
$publicId = $user->publicId;
- $user = new User($publicId);
+ $user = $users->getRowInstance($publicId);
$user->app = 'sciret';
$auth->getStorage()->write($user);
}
+
+ // reactivate row as live data
+ $user->setTable($users);
} else {
// guest user
- $user = new User();
+ $user = $users->createRow();
}
Zend_Registry::set('user', $user);
Modified: trunk/models/Article.php
===================================================================
--- trunk/models/Article.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/models/Article.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,7 +9,8 @@
* @packager Keyboard Monkeys Ltd
*/
-class Article {
+class Article
+{
var $id;
var $isBookmark = 0;
var $questionId;
@@ -285,14 +286,16 @@
function getCreatedBy() {
require_once 'models/User.php';
- $creator = new User($this->userId);
+ $users = new Users();
+ $creator = $users->getRowInstance($this->userId);
return $creator->getFullName();
}
function getModifiedBy() {
require_once 'models/User.php';
- $modifier = new User($this->modifiedByUserId);
+ $users = new Users();
+ $modifier = $users->getRowInstance($this->modifiedByUserId);
return $modifier->getFullName();
}
@@ -307,7 +310,8 @@
function getUser() {
if (!isset($this->user)) {
- $this->user = new User($this->getUserId());
+ $users = new Users();
+ $this->user = $users->getRowInstance($this->getUserId());
}
return $this->user;
Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/models/User.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,7 +9,8 @@
* @packager Keyboard Monkeys
*/
-class User {
+class User extends Zend_Db_Table_Row_Abstract
+{
const ROLE_ANONYMOUS = 1;
const ROLE_REGISTERED = 3; // 2 | ROLE_ANONYMOUS;
const ROLE_ADMIN = 7; // 4 | ROLE_REGISTERED ;
@@ -20,158 +21,100 @@
public $app = 'sciret';
public $publicId;
- var $id;
- var $firstName;
- var $lastName;
- var $userName;
- var $email;
- var $password;
- var $passwordChanged;
- var $admin = 0;
- var $role = User::ROLE_ANONYMOUS;
var $langArr;
var $skipTranslations = false;
- var $preferences = array(
- 'startBrowsing' => 'all',
- 'articlesPerPage' => 10,
- 'dateFormat' => 'Month Day, Year',
- 'language' => '', // set in the constructor
- 'navigationType' => 'catAndSubCats',
- 'hiddenCategories' => '',
- );
var $rtlLanguages = array('Hebrew');
var $disallowedPasswordChars = array('"', '@', '#', '%', '^', '&', '*', '(', ')', ',');
- function User($id = false) {
+ private $_preferencesArr;
- $this->preferences['language'] = Zend_Registry::get('config')->general->language_default;
-
- if ($id) {
- $query = 'SELECT firstname, lastname, username, email, password, password_changed, admin, preferences FROM users WHERE id = ?';
- $result = DB::getInstance()->query($query, $id);
- if ($row = $result->fetch()) {
- $this->id = $id;
- $this->firstName = $row['firstname'];
- $this->lastName = $row['lastname'];
- $this->userName = $row['username'];
- $this->email = $row['email'];
- $this->admin = $row['admin'];
- $this->password = $row['password'];
- $this->passwordChanged = $row['password_changed'];
- if ($row['preferences'] != '') {
- // this leaves the default values if preference is not set
- $tPreferences = unserialize($row['preferences']);
- foreach ($tPreferences as $key => $value) {
- $this->preferences[$key] = $value;
- }
- }
-
- $this->setRole();
- }
- }
-
- $this->init();
- }
-
- public function init() {
+ public function init()
+ {
if ($this->id) {
$this->publicId = $this->id;
}
- }
- function save() {
- $db = DB::getInstance();
- if (!isset($this->id)) {
- $query = 'INSERT INTO users SET firstname=?, lastname=?, username=?, email=?, admin=?, password=MD5(?), password_changed=?, preferences=?';
- $result = $db->query($query, array($this->firstName, $this->lastName, $this->userName, $this->email, $this->admin, $this->password, $this->passwordChanged, serialize($this->preferences)));
- $this->id = $db->lastInsertId();
- } else {
- $query = 'UPDATE users SET firstname=?, lastname=?, username=?, email=?, password_changed=?, admin=?, preferences=? WHERE id=?';
- $result = $db->query($query, array($this->firstName, $this->lastName, $this->userName, $this->email, $this->passwordChanged, $this->admin, serialize($this->preferences), $this->id));
+ if ($this->preferences) {
+ // this has to go here because when the object has been fetched from the DB,
+ // when init() is called it already has the fields filled in.
+ // It has to go under __set() below too, because when the object is initialized through
+ // createRow(), then when init() is called the fields haven't been initialized yet :/
+ $this->_initPreferencesArr($this->preferences);
}
}
- function getFirstName() {
- return $this->firstName;
+ private function _initPreferencesArr($preferences)
+ {
+ $this->_preferencesArr = unserialize($preferences);
+ if ($this->_preferencesArr['language'] == '') {
+ $this->_preferencesArr['language'] = Zend_Registry::get('config')->general->language_default;
+ }
}
- function setFirstName($firstName) {
- $this->firstName = $firstName;
+ public function __get($name)
+ {
+ if ($name == 'role') {
+ return $this->getRole();
+ }
+
+ return parent::__get($name);
}
- function getLastName() {
- return $this->lastName;
- }
+ public function __set($name, $value)
+ {
+ if ($name == 'preferences') {
+ $this->_initpreferencesArr($value);
+ }
- function setLastName($lastName) {
- $this->lastName = $lastName;
+ return parent::__set($name, $value);
}
- function getFullName() {
- return $this->firstName . ' ' . $this->lastName;
+ public function save()
+ {
+ $this->preferences = serialize($this->_preferencesArr);
+ parent::save();
}
- function getId() {
- return $this->id;
+ function getFullName()
+ {
+ return $this->firstname . ' ' . $this->lastname;
}
- function setId($id) {
+ function setId($id)
+ {
$this->publicId = (int)$id;
$this->id = (int)$id;
}
- function isAnonymous() {
- return !isset($this->id);
+ function isAnonymous()
+ {
+ return !($this->id);
}
- function getPasswordChanged() {
- return $this->passwordChanged;
+ function isAdmin()
+ {
+ return $this->admin == 1;
}
- function setPasswordChanged($date) {
- $this->passwordChanged = $date;
+ function setAdmin($isAdmin)
+ {
+ $this->admin = $isAdmin? 1 : 0;
}
- function isAdmin() {
- return $this->admin == 1;
- }
+ function getRole()
+ {
+ if ($this->isAnonymous()) {
+ return self::ROLE_ANONYMOUS;
+ }
- function setAdmin($isAdmin) {
- $this->admin = $isAdmin? 1 : 0;
if ($this->admin == 1) {
- $this->role = User::ROLE_ADMIN;
+ return self::ROLE_ADMIN;
}
- }
- function getUserName() {
- return $this->userName;
+ return self::ROLE_REGISTERED;
}
- function setUserName($userName) {
- $this->userName = $userName;
- }
-
- function getEmail() {
- return $this->email;
- }
-
- function setEmail($email) {
- $this->email = $email;
- }
-
- function getPassword() {
- return $this->password;
- }
-
- function setRole() {
- $this->role = ($this->admin == 1)? User::ROLE_ADMIN : User::ROLE_REGISTERED;
- }
-
- function getRole() {
- return $this->role;
- }
-
function _isPasswordValid($password)
{
foreach ($this->disallowedPasswordChars as $char) {
@@ -183,13 +126,14 @@
return true;
}
- function setPassword($password) {
+ function setPassword($password)
+ {
if (!$this->_isPasswordValid($password)) {
return false;
}
- $this->password = $password;
- $this->passwordChanged = date('Y-m-d');
+ $this->password = md5($password);
+ $this->password_changed = date('Y-m-d');
return true;
}
@@ -199,38 +143,36 @@
return $this->rtlLanguages;
}
- function changePassword($password) {
+ function changePassword($password)
+ {
// 18.12.2006 NE: Beim setzen des Passworts fehlte eine einschränkung auf den User,
// dessen sein Passwort geändert werden sollte
if (!$this->_isPasswordValid($password)) {
return false;
}
- $query = 'UPDATE users SET password=MD5(?), password_changed = \''.date('Y-m-d').'\' WHERE `id` = ?';
- DB::getInstance()->query($query, $password, $this->id);
- $this->passwordChanged = date('Y-m-d');
+ $this->password = md5($password);
+ $this->password_changed = date('Y-m-d');
return true;
}
-
- function getPreferences() {
- return $this->preferences;
- }
- function getPreference($field) {
- if ($this->role == User::ROLE_ANONYMOUS && isset($_COOKIE[$field])) {
+ function getPreference($field)
+ {
+ if ($this->isAnonymous() && isset($_COOKIE[$field])) {
return $_COOKIE[$field];
}
- return $this->preferences[$field];
+ return $this->_preferencesArr[$field];
}
- function setPreference($field, $value) {
- if ($this->role == User::ROLE_ANONYMOUS) {
+ function setPreference($field, $value)
+ {
+ if ($this->isAnonymous()) {
setcookie($field, $value, time() + 60*60*24*90); // cookie expires in 90 days
}
- $this->preferences[$field] = $value;
+ $this->_preferencesArr[$field] = $value;
}
function getDisallowedPasswordChars()
@@ -238,7 +180,8 @@
return $this->disallowedPasswordChars;
}
- function formatDate($date) {
+ function formatDate($date)
+ {
$timestamp = strtotime($date);
switch ($this->getPreference('dateFormat')) {
case 'Month Day, Year':
@@ -280,11 +223,13 @@
}
}
- function setSkipTranslations($bool) {
+ function setSkipTranslations($bool)
+ {
$this->skipTranslations = $bool;
}
- function lang($phrase, $args = false) {
+ function lang($phrase, $args = false)
+ {
$phrase = stripslashes($phrase);
if (!is_array($args)) {
$args = func_get_args();
@@ -337,12 +282,11 @@
return vsprintf($phrase, $args);
}
- function isPasswordExpired($expirationDays) {
+ function isPasswordExpired($expirationDays)
+ {
// there are 86400 seconds in one day
- $passwordAge = (time() - strtotime($this->passwordChanged)) / 86400;
+ $passwordAge = (time() - strtotime($this->password_changed)) / 86400;
return ($passwordAge > $expirationDays);
}
}
-
-?>
Deleted: trunk/models/UserGateway.php
===================================================================
--- trunk/models/UserGateway.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/models/UserGateway.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -1,69 +0,0 @@
-<?php
-
-/*
-* @copyright Copyright (C) 2005-2008 Keyboard Monkeys Ltd. http://www.kb-m.com
-* @license http://www.fsf.org/copyleft/lgpl.html GNU Lesser General Public License
-* @author Alejandro Pedraza
-* @since Sciret 1.2
-* @package Sciret
-* @packager Keyboard Monkeys
-*/
-
-require_once 'models/User.php';
-
-class UserGateway {
-
- public static function getValidatedUser($username, $password, $configuration) {
- if (in_array($configuration->getConfigValue('version'), array(0, '1.1.0'))) {
- $query = 'SELECT id, firstname, lastname, username, email, admin FROM users WHERE username=? AND password=MD5(?)';
- } else {
- $query = 'SELECT id, firstname, lastname, username, email, password_changed, admin FROM users WHERE username=? AND password=MD5(?)';
- }
- $result = DB::getInstance()->query($query, array($username, $password));
- if ($row = $result->fetch()) {
- $user = new User;
- $user->setId($row['id']);
- $user->setFirstName($row['firstname']);
- $user->setLastName($row['lastname']);
- $user->setUserName($row['username']);
- $user->setEmail($row['email']);
- if (!in_array($configuration->getConfigValue('version'), array(0, '1.1.0'))) {
- $user->setPasswordChanged($row['password_changed']);
- }
- $user->setAdmin($row['admin']);
- $user->setRole();
-
- return $user;
- }
-
- return false;
- }
-
- function getUsersList() {
- $query = 'SELECT id, firstname, lastname, username, email, admin FROM users';
- $result = DB::getInstance()->query($query);
- $users = array();
- while ($row = $result->fetch()) {
- $user = new User;
- $user->setId($row['id']);
- $user->setFirstName($row['firstname']);
- $user->setLastName($row['lastname']);
- $user->setUserName($row['username']);
- $user->setEmail($row['email']);
- $user->setAdmin($row['admin']);
- $users[] = $user;
- }
-
- return $users;
- }
-
- function deleteUser($userId) {
- $query = 'DELETE FROM users WHERE id=?';
- DB::getInstance()->query($query, $userId);
-
- $query = 'UPDATE articles SET user_id = 1 WHERE user_id=?';
- DB::getInstance()->query($query, $userId);
- }
-}
-
-?>
Added: trunk/models/Users.php
===================================================================
--- trunk/models/Users.php (rev 0)
+++ trunk/models/Users.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -0,0 +1,49 @@
+<?php
+
+class Users extends SciretTableGateway
+{
+ protected $_name = 'users';
+ protected $_primary = 'id';
+ protected $_rowClass = 'User';
+
+ public function createRow()
+ {
+ $preferences = array(
+ 'startBrowsing' => 'all',
+ 'articlesPerPage' => 10,
+ 'dateFormat' => 'Month Day, Year',
+ 'language' => '', // set in the constructor
+ 'navigationType' => 'catAndSubCats',
+ 'hiddenCategories' => '',
+ );
+
+ return parent::createRow(array(
+ 'password_changed' => '0000-00-00',
+ 'admin' => 0,
+ 'preferences' => serialize($preferences),
+ ));
+ }
+
+ public function getUserGivenUsername($username)
+ {
+ $select = $this->select()
+ ->where('username=?', $username);
+
+ return $this->fetchRow($select);
+ }
+
+ function getUsersList()
+ {
+ $select = $this->select();
+ return $this->fetchAll($select);
+ }
+
+ function deleteUser($userId)
+ {
+ $where = $this->getAdapter()->quoteInto('id=?', $userId);
+ $this->delete($where);
+
+ $where = $this->getAdapter()->quoteInto('user_id=?', $userId);
+ $this->getAdapter()->update('articles', array('user_id' => 1), $where);
+ }
+}
Modified: trunk/templates/EditBookmark.tpl
===================================================================
--- trunk/templates/EditBookmark.tpl 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/templates/EditBookmark.tpl 2008-08-28 20:52:12 UTC (rev 660)
@@ -10,87 +10,87 @@
-->
<form name="saveArticleForm" method="POST" action="{formAction}">
-<input type="hidden" name="draft" value="0" />
-<table width="100%" border="0" cellspacing="1" cellpadding="3" border="1" style='border:1px solid black'>
- <!-- BEGIN bookmark_id_block -->
- <tr class="th">
- <input type="hidden" name="bookmarkId" value="{bookmarkId}" />
- <td style="text-align:right; font-weight:bold">
- [l]Bookmark ID[/l]:
- </td>
- <td>
- {bookmarkId}
- </td>
- </tr>
- <!-- END bookmark_id_block -->
- <tr class="row_on">
- <td width="10%" style="text-align:right;">
- <span style='font:normal 12px sans-serif; font-weight:bold'>[l]Category[/l]:</span>
- </td>
- <td width="90%">
- <select name="cat_id">
- <option value="0">[l]None[/l]</option>
- <!-- BEGIN categories_block -->
- <option value="{category_id}" {catSelected}>{category_label}</option>
- <!-- END categories_block -->
- </select>
- </td>
- </tr>
- <tr class="row_off">
- <td align=right style="text-align:right">
- <span style='font:normal 12px sans-serif; font-weight:bold'>[l]Name[/l]:</span>
- </td>
- <td>
- <input type="text" size="70" name="name" value="{name}" />
- </td>
- </tr>
- <tr class="row_on">
- <td align=right style="text-align:right">
- <span style='font:normal 12px sans-serif; font-weight:bold'>[l]URL[/l]:</span>
- </td>
- <td>
- <input type="text" size="70" name="url" value="{url}" />
- </td>
- </tr>
- <tr class="row_off">
- <td style="text-align:right; font:normal 12px sans-serif; font-weight:bold" nowrap="true">
- [l]Expiration Date[/l]:
- </td>
- <td>
- <input type="hidden" id="hiddenDate" name="expDate" value="{expDate}" />
- <span id="dateShow">{expDateContents}</span>
- <img src="images/datepopup.gif" id="expDateButton" style="cursor:pointer" />
- <span id="labelSetDate" style="display:{labelSetExpDateDisplay}">([l]Currently none.<br />Click icon to set one.[/l])</span>
- <a id="removeDateLink" href="javascript:void(0);" onclick="removeExpirationDate();" style="display:{removeExpDateLinkDisplay}; font-weight:bold; font-size:10px">[l]Remove expiration date[/l]</a>
- </td>
- </tr>
- <tr class="row_on">
- <td align="right" valign="top" style="text-align:right">
- <span style='font:normal 12px sans-serif; font-weight:bold'>[l]Description[/l]:</span>
- </td>
- <td>
- <textarea name="description" cols="67" rows="5" >{description}</textarea>
- </td>
- </tr>
- <tr class="th">
- <td colspan=2>
-
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="submit" value="[l]Save[/l]" />
- <b>{publicationNotice}</b>
- </td>
- </tr>
- <!-- BEGIN saveAsDraftButton_block -->
- <tr>
- <td colspan="2">
- <input type="button" value="[l]Save as Draft[/l]" onclick="saveDraft(form);" />
- </td>
- </tr>
- <!-- END saveAsDraftButton_block -->
-</table>
+ <input type="hidden" name="draft" value="0" />
+ <table width="100%" border="0" cellspacing="1" cellpadding="3" border="1" style='border:1px solid black'>
+ <!-- BEGIN bookmark_id_block -->
+ <tr class="th">
+ <input type="hidden" name="bookmarkId" value="{bookmarkId}" />
+ <td style="text-align:right; font-weight:bold">
+ [l]Bookmark ID[/l]:
+ </td>
+ <td>
+ {bookmarkId}
+ </td>
+ </tr>
+ <!-- END bookmark_id_block -->
+ <tr class="row_on">
+ <td width="10%" style="text-align:right;">
+ <span style='font:normal 12px sans-serif; font-weight:bold'>[l]Category[/l]:</span>
+ </td>
+ <td width="90%">
+ <select name="cat_id">
+ <option value="0">[l]None[/l]</option>
+ <!-- BEGIN categories_block -->
+ <option value="{category_id}" {catSelected}>{category_label}</option>
+ <!-- END categories_block -->
+ </select>
+ </td>
+ </tr>
+ <tr class="row_off">
+ <td align=right style="text-align:right">
+ <span style='font:normal 12px sans-serif; font-weight:bold'>[l]Name[/l]:</span>
+ </td>
+ <td>
+ <input type="text" size="50" name="name" value="{name}" />
+ </td>
+ </tr>
+ <tr class="row_on">
+ <td align=right style="text-align:right">
+ <span style='font:normal 12px sans-serif; font-weight:bold'>[l]URL[/l]:</span>
+ </td>
+ <td>
+ <input type="text" size="50" name="url" value="{url}" />
+ </td>
+ </tr>
+ <tr class="row_off">
+ <td style="text-align:right; font:normal 12px sans-serif; font-weight:bold" nowrap="true">
+ [l]Expiration Date[/l]:
+ </td>
+ <td>
+ <input type="hidden" id="hiddenDate" name="expDate" value="{expDate}" />
+ <span id="dateShow">{expDateContents}</span>
+ <img src="images/datepopup.gif" id="expDateButton" style="cursor:pointer" />
+ <span id="labelSetDate" style="display:{labelSetExpDateDisplay}">([l]Currently none.<br />Click icon to set one.[/l])</span>
+ <a id="removeDateLink" href="javascript:void(0);" onclick="removeExpirationDate();" style="display:{removeExpDateLinkDisplay}; font-weight:bold; font-size:10px">[l]Remove expiration date[/l]</a>
+ </td>
+ </tr>
+ <tr class="row_on">
+ <td align="right" valign="top" style="text-align:right">
+ <span style='font:normal 12px sans-serif; font-weight:bold'>[l]Description[/l]:</span>
+ </td>
+ <td>
+ <textarea name="description" cols="67" rows="5" >{description}</textarea>
+ </td>
+ </tr>
+ <tr class="th">
+ <td colspan=2>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="submit" value="[l]Save[/l]" />
+ <b>{publicationNotice}</b>
+ </td>
+ </tr>
+ <!-- BEGIN saveAsDraftButton_block -->
+ <tr>
+ <td colspan="2">
+ <input type="button" value="[l]Save as Draft[/l]" onclick="saveDraft(form);" />
+ </td>
+ </tr>
+ <!-- END saveAsDraftButton_block -->
+ </table>
</form>
<script type="text/javascript">
Calendar.setup(
Modified: trunk/views/EditArticle.php
===================================================================
--- trunk/views/EditArticle.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/EditArticle.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -66,9 +66,9 @@
$this->tpl->parse('article_id', 'article_id_block');
- if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
+ if ($this->user->isAdmin()) {
$this->tpl->set_var(array(
- ));
+ ));
$this->tpl->parse('usage_id','usage_block');
} else {
$this->tpl->set_var('usage_id', '');
Modified: trunk/views/EditPreferences.php
===================================================================
--- trunk/views/EditPreferences.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/EditPreferences.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -11,9 +11,10 @@
require 'views/View.php';
-class EditPreferences extends View {
-
- function dispatch() {
+class EditPreferences extends View
+{
+ function dispatch()
+ {
$this->tpl->set_file('edit_preferences', 'EditPreferences.tpl');
$this->tpl->set_block('edit_preferences', 'languages_block', 'languages');
$this->tpl->set_block('edit_preferences', 'adminPreferences_block', 'adminPreferences');
@@ -92,5 +93,3 @@
$this->tpl->pparse('out', 'edit_preferences');
}
}
-
-?>
Modified: trunk/views/EditTodo.php
===================================================================
--- trunk/views/EditTodo.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/EditTodo.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -37,7 +37,7 @@
$todo = new Todo($todoId);
- if ($todo->getUserId() != $this->user->getId()) {
+ if ($todo->getUserId() != $this->user->id) {
die('You don\'t have permission to edit this To-Do');
}
Modified: trunk/views/EditUser.php
===================================================================
--- trunk/views/EditUser.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/EditUser.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -11,11 +11,12 @@
require 'views/View.php';
-class EditUser extends View {
-
- function dispatch() {
+class EditUser extends View
+{
+ function dispatch()
+ {
// security check
- if (!$this->user->isAdmin() && $this->user->getId() != $_GET['userId']) {
+ if (!$this->user->isAdmin() && $this->user->id != $_GET['userId']) {
echo $this->user->lang('What are you trying to do??');
return;
}
@@ -26,14 +27,15 @@
$this->tpl->set_block('addUser', 'adminAccess_block', 'adminAccess');
$this->tpl->set_var('formAction', Library::getLink(array('action' => 'EditUser')));
- $user = new User($userId);
- if ($user->getId()) {
+ $users = new Users();
+ $user = $users->getRowInstance($userId);
+ if ($userId) {
$this->tpl->set_var(array(
- 'userId' => $user->getId(),
- 'firstName' => $user->getFirstName(),
- 'lastName' => $user->getLastName(),
- 'userName' => $user->getUserName(),
- 'email' => $user->getEmail(),
+ 'userId' => $user->id,
+ 'firstName' => $user->firstname,
+ 'lastName' => $user->lastname,
+ 'userName' => $user->username,
+ 'email' => $user->email,
'password' => '',
'password2' => '',
'checkedAdminAccess' => $user->isAdmin()? 'checked="true" ' : '',
@@ -64,5 +66,3 @@
$this->tpl->pparse('out', 'addUser');
}
}
-
-?>
Modified: trunk/views/GetFavoritesDropdown.php
===================================================================
--- trunk/views/GetFavoritesDropdown.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/GetFavoritesDropdown.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -10,14 +10,15 @@
*/
require 'views/View.php';
-require 'models/FavoriteGateway.php';
define('TITLE_LENGTH', 35);
-class GetFavoritesDropdown extends View {
+class GetFavoritesDropdown extends View
+{
var $categories;
- function dispatch() {
+ function dispatch()
+ {
$this->tpl->set_file('favoritesDropdown', 'FavoritesDropdown.tpl');
$this->tpl->set_block('favoritesDropdown', 'favoritesList_block', 'favoritesList');
$this->tpl->set_block('favoritesList_block', 'favoriteItem_block', 'favoriteItem');
@@ -27,7 +28,7 @@
$favoriteGateway = new FavoriteGateway;
$thereAreFavorites = false;
$firstIteration = true;
- foreach ($favoriteGateway->getFavorites($this->user->getId()) as $favorite) {
+ foreach ($favoriteGateway->getFavorites($this->user->id) as $favorite) {
$thereAreFavorites = true;
switch($favorite->getType()) {
case FAVORITE_TYPE_ARTICLE:
@@ -81,5 +82,3 @@
$this->tpl->pparse('out', 'favoritesDropdown');
}
}
-
-?>
Modified: trunk/views/GetTodosDropdown.php
===================================================================
--- trunk/views/GetTodosDropdown.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/GetTodosDropdown.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -10,12 +10,13 @@
*/
require 'views/View.php';
-require 'models/TodoGateway.php';
-class GetTodosDropdown extends View {
+class GetTodosDropdown extends View
+{
var $categories;
- function dispatch() {
+ function dispatch()
+ {
$this->tpl->set_file('todosDropdown', 'TodosDropdown.tpl');
$this->tpl->set_block('todosDropdown', 'todosList_block', 'todosList');
$this->tpl->set_block('todosList_block', 'todoItem_block', 'todoItem');
@@ -30,7 +31,7 @@
$todoGateway = new TodoGateway;
$thereAreTodos = false;
$firstIteration = true;
- foreach ($todoGateway->getTodos($this->user->getId()) as $todo) {
+ foreach ($todoGateway->getTodos($this->user->id) as $todo) {
$thereAreTodos = true;
$this->tpl->set_var(array(
'todoId' => $todo->getId(),
@@ -68,7 +69,7 @@
if ($todo->getStatus() == TODO_STATUS_PENDING) {
$this->tpl->set_var('textDecoration', '');
- if ($todo->getUserId() == $this->user->getId()) {
+ if ($todo->getUserId() == $this->user->id) {
$this->tpl->parse('checkTodo', 'checkTodo_block');
} else {
$this->tpl->set_var('checkTodo', '');
@@ -78,7 +79,7 @@
$this->tpl->set_var('checkTodo', '');
}
- if ($todo->getUserId() != $this->user->getId()) {
+ if ($todo->getUserId() != $this->user->id) {
$this->tpl->set_var('linkTodo1', '');
$this->tpl->set_var('linkTodo2', '');
} else {
@@ -101,7 +102,8 @@
$this->tpl->pparse('out', 'todosDropdown');
}
- function _filterContent($content) {
+ function _filterContent($content)
+ {
$content = nl2br($content);
$content = str_replace(array("\n", "\r"), array('', ''), $content);
$content = addslashes($content);
@@ -109,5 +111,3 @@
return $content;
}
}
-
-?>
Modified: trunk/views/MainView.php
===================================================================
--- trunk/views/MainView.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/MainView.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -14,10 +14,12 @@
require 'models/QuestionGateway.php';
require 'models/FavoriteGateway.php';
-class MainView extends View {
+class MainView extends View
+{
var $categories;
- function dispatch() {
+ function dispatch()
+ {
if (isset($_GET['catId'])) {
$catId = (int)$_GET['catId'];
} else {
@@ -71,7 +73,7 @@
if ($catId != 0) {
$favoriteGateway = new FavoriteGateway;
- if ($favoriteGateway->isLocationFavorite($_GET['catId'], $this->user->getId())) {
+ if ($favoriteGateway->isLocationFavorite($_GET['catId'], $this->user->id)) {
$this->tpl->set_var(array(
'favoriteLocationStarImgDisplay' => 'none',
'unFavoriteLocationStarImgDisplay' => 'inline',
@@ -289,5 +291,3 @@
$this->tpl->pparse('out', 'main');
}
}
-
-?>
Modified: trunk/views/ManageArticles.php
===================================================================
--- trunk/views/ManageArticles.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/ManageArticles.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -12,9 +12,10 @@
require 'views/View.php';
-class ManageArticles extends View {
-
- function dispatch() {
+class ManageArticles extends View
+{
+ function dispatch()
+ {
if (!isset($_GET['selectArticles']) || $_GET['selectArticles'] != 1) {
$this->_showHeader();
}
@@ -205,7 +206,9 @@
}
$this->tpl->pparse('out', 'manageArticles');
+
+ if (!isset($_GET['selectArticles']) || $_GET['selectArticles'] != 1) {
+ $this->showFooter();
+ }
}
}
-
-?>
Modified: trunk/views/ManageUsers.php
===================================================================
--- trunk/views/ManageUsers.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/ManageUsers.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -10,11 +10,11 @@
*/
require 'views/View.php';
-require 'models/UserGateway.php';
-class ManageUsers extends view {
-
- function dispatch() {
+class ManageUsers extends view
+{
+ function dispatch()
+ {
$this->tpl->set_file('manageUsers', 'ManageUsers.tpl');
$this->tpl->set_block('manageUsers', 'usersBlock', 'users');
$this->tpl->set_block('usersBlock', 'delete_block', 'delete');
@@ -23,22 +23,22 @@
'AddUserLink' => Library::getLink(array('view' => 'EditUser')),
));
- $userGateway = new UserGateway;
- $users = $userGateway->getUsersList();
+ $users= new Users();
+ $users = $users->getUsersList();
$firstIteration = true;
$rowClass = 'row_off';
foreach ($users as $user) {
$this->tpl->set_var(array(
- 'editUserLink' => Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())),
+ 'editUserLink' => Library::getLink(array('view' => 'EditUser', 'userId' => $user->id)),
'rowClass' => $rowClass,
'name' => $user->getFullName(),
'nameSlashed' => addslashes($user->getFullName()),
- 'userId' => $user->getId(),
- 'userName' => $user->getUserName(),
- 'email' => $user->getEmail(),
- 'adminRights' => $user->getRole() == User::ROLE_ADMIN? $this->user->lang('Yes') : $this->user->lang('No'),
+ 'userId' => $user->id,
+ 'userName' => $user->username,
+ 'email' => $user->email,
+ 'adminRights' => $user->isAdmin()? $this->user->lang('Yes') : $this->user->lang('No'),
));
- if ($user->getId() != 1) {
+ if ($user->id != 1) {
$this->tpl->parse('delete', 'delete_block');
} else {
$this->tpl->set_var('delete', '');
@@ -51,5 +51,3 @@
$this->tpl->pparse('out', 'manageUsers');
}
}
-
-?>
Modified: trunk/views/SearchResults.php
===================================================================
--- trunk/views/SearchResults.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/SearchResults.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -9,14 +9,11 @@
* @packager Keyboard Monkeys
*/
-require 'views/View.php';
-require 'models/CategoryGateway.php';
-require 'models/FavoriteGateway.php';
+class SearchResults extends View
+{
+ function dispatch()
+ {
-class SearchResults extends View {
-
- function dispatch() {
-
$this->tpl->set_var('checked_all', (!isset($_GET['set']) || $_GET['set'] == 'all')? 'checked="true"' : '');
$this->tpl->set_var('checked_articles', (isset($_GET['set']) && $_GET['set'] == 'articles')? 'checked="true"' : '');
$this->tpl->set_var('checked_bookmarks', (isset($_GET['set']) && $_GET['set'] == 'bookmarks')? 'checked="true"' : '');
@@ -27,7 +24,7 @@
$this->tpl->set_block('searchResults', 'numResults_block', 'numResults');
$favoriteGateway = new FavoriteGateway;
- if (!isset($_GET['advancedSearch']) && $favoriteGateway->isSearchResultFavorite($_GET['query'], $this->user->getId())) {
+ if (!isset($_GET['advancedSearch']) && $favoriteGateway->isSearchResultFavorite($_GET['query'], $this->user->id)) {
$this->tpl->set_var(array(
'favoriteSearchResultsStarImgDisplay' => 'none',
'unFavoriteSearchResultsStarImgDisplay' => 'inline',
@@ -136,5 +133,3 @@
$this->tpl->pparse('out', 'searchResults');
}
}
-
-?>
Modified: trunk/views/View.php
===================================================================
--- trunk/views/View.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/View.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -139,7 +139,7 @@
$this->tpl->set_block('header', 'editProfileLink_block', 'editProfileLink');
if (!$this->user->isAnonymous() && !$this->user->isAdmin()) {
- $this->tpl->set_var('editProfileHref', Library::getLink(array('view' => 'EditUser', 'userId' => $this->user->getId())));
+ $this->tpl->set_var('editProfileHref', Library::getLink(array('view' => 'EditUser', 'userId' => $this->user->id)));
$this->tpl->parse('editProfileLink', 'editProfileLink_block');
} else {
$this->tpl->set_var('editProfileLink', '');
Modified: trunk/views/ViewArticle.php
===================================================================
--- trunk/views/ViewArticle.php 2008-08-28 20:50:05 UTC (rev 659)
+++ trunk/views/ViewArticle.php 2008-08-28 20:52:12 UTC (rev 660)
@@ -16,11 +16,13 @@
require 'views/ViewRelatedArticles.php';
require 'views/ViewComments.php';
-class ViewArticle extends View {
+class ViewArticle extends View
+{
var $article;
- function preDispatch() {
+ function preDispatch()
+ {
$thi...
[truncated message content] |
|
From: <al...@us...> - 2008-08-28 20:50:07
|
Revision: 659
http://sciret.svn.sourceforge.net/sciret/?rev=659&view=rev
Author: alpeb
Date: 2008-08-28 20:50:05 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
readded status message placeholder
Modified Paths:
--------------
trunk/templates/header.tpl
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2008-08-28 20:48:37 UTC (rev 658)
+++ trunk/templates/header.tpl 2008-08-28 20:50:05 UTC (rev 659)
@@ -64,3 +64,5 @@
</div><!-- end menu -->
<div id="content_left">
+ <div id="statusMessage" style='display:inline; margin:5px 0; font-weight:bold; text-align:center; color:red'>{message}</div>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-08-28 20:48:39
|
Revision: 658
http://sciret.svn.sourceforge.net/sciret/?rev=658&view=rev
Author: alpeb
Date: 2008-08-28 20:48:37 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
after saving the preferences, redirect to home using the article filter just chosen in the preferences
Modified Paths:
--------------
trunk/actions/SavePreferences.php
Modified: trunk/actions/SavePreferences.php
===================================================================
--- trunk/actions/SavePreferences.php 2008-08-28 20:46:48 UTC (rev 657)
+++ trunk/actions/SavePreferences.php 2008-08-28 20:48:37 UTC (rev 658)
@@ -11,9 +11,10 @@
require 'actions/Action.php';
-class SavePreferences extends Action {
-
- function dispatch() {
+class SavePreferences extends Action
+{
+ function dispatch()
+ {
if (in_array($_POST['startBrowsing'], array('all', 'articles', 'bookmarks'))) {
$this->user->setPreference('startBrowsing', $_POST['startBrowsing']);
}
@@ -32,7 +33,7 @@
$this->user->setPreference('navigationType', $_POST['navigationType']);
}
- if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
+ if (($this->user->role & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
$this->configuration->setConfigValue('publishKB', $_POST['publishKB'] == '1'? '1' : '0');
$this->configuration->setConfigValue('publishArticlesAuto', $_POST['publishArticlesAuto'] == '1'? '1' : '0');
$this->configuration->setConfigValue('publishBookmarksAuto', $_POST['publishBookmarksAuto'] == '1'? '1' : '0');
@@ -55,8 +56,6 @@
$this->user->save();
$_SESSION['message'] = $this->user->lang('Preferences saved successfully');
- Library::redirect(Library::getLink(array('view' => 'MainView')));
+ Library::redirect(Library::getLink(array('view' => 'MainView', 'set' => $this->user->getPreference('startBrowsing'))));
}
}
-
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-08-28 20:46:50
|
Revision: 657
http://sciret.svn.sourceforge.net/sciret/?rev=657&view=rev
Author: alpeb
Date: 2008-08-28 20:46:48 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
fixed bad query
Modified Paths:
--------------
trunk/models/ArticleGateway.php
Modified: trunk/models/ArticleGateway.php
===================================================================
--- trunk/models/ArticleGateway.php 2008-08-28 20:45:04 UTC (rev 656)
+++ trunk/models/ArticleGateway.php 2008-08-28 20:46:48 UTC (rev 657)
@@ -87,7 +87,7 @@
break;
case 'withFullName':
$query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, firstname, lastname '
- .'FROM articles art LEFT JOIN users u ON art.user_id = u.id'
+ .'FROM articles art LEFT JOIN users u ON art.user_id = u.id '
. $where . " ORDER BY $order $direction";
if ($numRecords != -1) {
$query .= ' LIMIT ' . (int)$offset . ', ' . (int)$numRecords;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
