Permalink
Browse files

build 820: fixed isBlocked()

  • Loading branch information...
1 parent cc45164 commit 88600231c363f068f11fbf2c0269f64da650d3fb @frozeman committed Mar 25, 2012
View
3 CHANGELOG
@@ -1,7 +1,7 @@
feindura - Flat File Content Management System
Version
1.1.6
-Build 819
+Build 820
==================================================
Copyright (C) Fabian Vogelsteller [frozeman.de]
published under the GNU General Public License version 3
@@ -22,6 +22,7 @@ if not, see <http://www.gnu.org/licenses>.
ChangeLog:
---------
+ build 820: fixed isBlocked()
build 819: add switch languages with selection, add and fixed LeavePagesWithoutSaving() function
build 818: transforms now non localized to multilanguage pages, but not backwards (see pageSetup.controller.php)
build 817: changed the name from pageLanguage -> websiteLanguage
View
6 library/functions/backend.functions.php
@@ -136,13 +136,17 @@ function isAdmin() {
*
*/
function isBlocked($returnBool = false) {
+ $return = '';
foreach($GLOBALS['userCache'] as $cachedUser) {
$location = trim($cachedUser['location']);
if($cachedUser['identity'] != IDENTITY &&
$cachedUser['edit'] &&
$location != 'new' && // dont block when createing a new page (multiple user can do that)
($location == $_GET['page'] || $location == $_GET['site'])) {
- return ($returnBool) ? true : '<div id="contentBlocked">'.$GLOBALS['langFile']['GENERAL_TEXT_CURRENTLYEDITED'].'<br /><span style="font-size:15px;">'.$GLOBALS['langFile']['DASHBOARD_TITLE_USER'].': <span class="blue">'.$cachedUser['username'].'</span></span></div>';
+ $return = ($returnBool) ? true : '<div id="contentBlocked">'.$GLOBALS['langFile']['GENERAL_TEXT_CURRENTLYEDITED'];
+ if(!empty($cachedUser['username'])) $return .= '<br /><span style="font-size:15px;">'.$GLOBALS['langFile']['DASHBOARD_TITLE_USER'].': <span class="blue">'.$cachedUser['username'].'</span></span>';
+ $return .= '</div>';
+ return $return;
}
}
return false;
View
2 library/languages/fr.backend.php
@@ -227,6 +227,8 @@
$langFile['BUTTON_TOOLTIP_THUMBNAIL_UPLOAD'] = 'Télécharger thumbnail pour cette page.';
$langFile['BUTTON_THUMBNAIL_DELETE'] = 'éffacer thumbnail de la page';
$langFile['BUTTON_TOOLTIP_THUMBNAIL_DELETE'] = 'Éffacer thumbnail de cette page.';
+$langFile['BUTTON_WEBSITELANGUAGE_ADD'] = 'Ajouter une langue';
+$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_ADD'] = 'Ajouter une traduction nouvelle langue sur cette pagee';
$langFile['BUTTON_WEBSITELANGUAGE_DELETE'] = 'supprimer langue';
$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_DELETE'] = 'Supprimer langue &quot;%s&quot; pour cette page';
View
10 library/languages/it.backend.php
@@ -238,10 +238,12 @@
$langFile['BUTTON_TOOLTIP_DELETEPAGE'] = 'Elimina Questa Pagina';
$langFile['BUTTON_FRONTENDEDITPAGE'] = 'Modifica Pagina Frontalmente';
$langFile['BUTTON_TOOLTIP_FRONTENDEDITPAGE'] = 'Modifica Pagina Sul Sito.';
-$langFile['BUTTON_THUMBNAIL_UPLOAD'] = 'Carica Miniatura Nella Pagina';
-$langFile['BUTTON_TOOLTIP_THUMBNAIL_UPLOAD'] = 'Carica Miniatura';
-$langFile['BUTTON_THUMBNAIL_DELETE'] = 'Elimina Miniatura Della Pagina';
-$langFile['BUTTON_TOOLTIP_THUMBNAIL_DELETE'] = 'Elimina Miniatura';
+$langFile['BUTTON_THUMBNAIL_UPLOAD'] = 'Carica Miniatura';
+$langFile['BUTTON_TOOLTIP_THUMBNAIL_UPLOAD'] = 'Carica Miniatura Nella Pagina';
+$langFile['BUTTON_THUMBNAIL_DELETE'] = 'Elimina Miniatura';
+$langFile['BUTTON_TOOLTIP_THUMBNAIL_DELETE'] = 'Elimina Miniatura Della Pagina';
+$langFile['BUTTON_WEBSITELANGUAGE_ADD'] = 'Aggiungi Lingua';
+$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_ADD'] = 'Aggiungere una nuova traduzione lingua di questa pagina';
$langFile['BUTTON_WEBSITELANGUAGE_DELETE'] = 'Elimina Lingua';
$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_DELETE'] = 'Eliminare Lingua &quot;%s&quot; per questa pagina';
View
2 library/languages/ru.backend.php
@@ -244,6 +244,8 @@
$langFile['BUTTON_TOOLTIP_THUMBNAIL_UPLOAD'] = 'Загрузить миниатюру к этой странице';
$langFile['BUTTON_THUMBNAIL_DELETE'] = 'Удалить минитюру страницы';
$langFile['BUTTON_TOOLTIP_THUMBNAIL_DELETE'] = 'Удалить миниатюру к этой странице';
+$langFile['BUTTON_WEBSITELANGUAGE_ADD'] = 'Добавить языка';
+$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_ADD'] = 'Добавить новый перевод этой страницы';
$langFile['BUTTON_WEBSITELANGUAGE_DELETE'] = 'Удаление языка';
$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_DELETE'] = 'Удаление языка &quot;%s&quot; для этой страницы';

0 comments on commit 8860023

Please sign in to comment.