diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php
index 878e7d5a..39307f0c 100644
--- a/include/admin/category.inc.php
+++ b/include/admin/category.inc.php
@@ -40,11 +40,11 @@ if (isset($_POST['SAVE']) && serendipity_checkFormToken()) {
serendipity_ACLGrant($catid, 'category', 'read', $serendipity['POST']['cat']['read_authors']);
serendipity_ACLGrant($catid, 'category', 'write', $serendipity['POST']['cat']['write_authors']);
- echo '
'. CATEGORY_SAVED .'
';
+ echo ' . ')
' . CATEGORY_SAVED .'
';
} elseif ($serendipity['GET']['adminAction'] == 'edit') {
if (!serendipity_checkPermission('adminCategoriesMaintainOthers') && !serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write')) {
- echo ''. PERM_DENIED .'
';
+ echo ' . ')
'. PERM_DENIED .'
';
} else {
/* Check to make sure parent is not a child of self */
$r = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category c
@@ -58,7 +58,7 @@ if (isset($_POST['SAVE']) && serendipity_checkFormToken()) {
serendipity_updateCategory($serendipity['GET']['cid'], $name, $desc, $authorid, $icon, $parentid, $serendipity['POST']['cat']['sort_order'], $serendipity['POST']['cat']['hide_sub']);
serendipity_ACLGrant($serendipity['GET']['cid'], 'category', 'read', $serendipity['POST']['cat']['read_authors']);
serendipity_ACLGrant($serendipity['GET']['cid'], 'category', 'write', $serendipity['POST']['cat']['write_authors']);
- echo ''. CATEGORY_SAVED .'
';
+ echo ' . ')
' . CATEGORY_SAVED .'
';
}
}
}
@@ -103,12 +103,12 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
}
}
- echo ''. ($remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, (int)$serendipity['GET']['cid'], $remaining_cat) : sprintf(CATEGORY_DELETED,(int)$serendipity['GET']['cid'])) .'
';
+ echo ' . ')
' . ($remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, (int)$serendipity['GET']['cid'], $remaining_cat) : sprintf(CATEGORY_DELETED,(int)$serendipity['GET']['cid'])) .'
';
$serendipity['GET']['adminAction'] = 'view';
}
}
} else {
- echo ''. INVALID_CATEGORY .'
';
+ echo ' . ')
'. INVALID_CATEGORY .'
';
}
}
?>
diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index 64f38e04..8cae9962 100644
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -391,7 +391,11 @@ foreach ($sql as $rs) {
$header_class = ($comment['status'] == 'pending' ? 'serendipityAdminMsgNote' : '');
?>
-
diff --git a/include/admin/configuration.inc.php b/include/admin/configuration.inc.php
index 4ecb2cfd..29c97fe4 100644
--- a/include/admin/configuration.inc.php
+++ b/include/admin/configuration.inc.php
@@ -24,7 +24,7 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
$res = serendipity_updateConfiguration();
if (is_array($res)) {
echo DIAGNOSTIC_ERROR;
- echo '- ' . implode('
', $res) . '
';
+ echo '-
 . ')
' . implode('
', $res) . '
';
} else {
/* If we have new rewrite rules, then install them */
$permalinkOld = array(
@@ -65,7 +65,7 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
serendipity_buildPermalinks();
}
- echo '
'. WRITTEN_N_SAVED .'
';
+ echo '
 . ')
' . WRITTEN_N_SAVED .'
';
}
break;
diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index 433e4484..c502c50e 100644
--- a/include/admin/entries.inc.php
+++ b/include/admin/entries.inc.php
@@ -409,11 +409,11 @@ switch($serendipity['GET']['adminAction']) {
if ($serendipity['POST']['preview'] != 'true') {
/* We don't need an iframe to save a draft */
if ( $serendipity['POST']['isdraft'] == 'true' ) {
- echo '' . IFRAME_SAVE_DRAFT . '
';
+ echo ' . ')
' . IFRAME_SAVE_DRAFT . '
';
serendipity_updertEntry($entry);
} else {
if ($serendipity['use_iframe']) {
- echo '' . IFRAME_SAVE . '
';
+ echo ' . ')
' . IFRAME_SAVE . '
';
serendipity_iframe_create('save', $entry);
} else {
serendipity_iframe($entry, 'save');
@@ -465,7 +465,7 @@ switch($serendipity['GET']['adminAction']) {
}
if ($serendipity['use_iframe']) {
- echo '' . IFRAME_PREVIEW . '
';
+ echo ' . ')
' . IFRAME_PREVIEW . '
';
serendipity_iframe_create('preview', $entry);
} else {
serendipity_iframe($entry, 'preview');
diff --git a/include/admin/groups.inc.php b/include/admin/groups.inc.php
index ef6b5057..a85435fa 100644
--- a/include/admin/groups.inc.php
+++ b/include/admin/groups.inc.php
@@ -14,7 +14,7 @@ if (!serendipity_checkPermission('adminUsersGroups')) {
if (isset($_POST['DELETE_YES']) && serendipity_checkFormToken()) {
$group = serendipity_fetchGroup($serendipity['POST']['group']);
serendipity_deleteGroup($serendipity['POST']['group']);
- printf('' . DELETED_GROUP . '
', $serendipity['POST']['group'], $group['name']);
+ printf(' . ')
' . DELETED_GROUP . '
', $serendipity['POST']['group'], $group['name']);
}
/* Save new group */
@@ -22,7 +22,7 @@ if (isset($_POST['SAVE_NEW']) && serendipity_checkFormToken()) {
$serendipity['POST']['group'] = serendipity_addGroup($serendipity['POST']['name']);
$perms = serendipity_getAllPermissionNames();
serendipity_updateGroupConfig($serendipity['POST']['group'], $perms, $serendipity['POST'], false, $serendipity['POST']['forbidden_plugins'], $serendipity['POST']['forbidden_hooks']);
- printf('' . CREATED_GROUP . '
', '#' . $serendipity['POST']['group'] . ', ' . $serendipity['POST']['name']);
+ printf(' . ')
' . CREATED_GROUP . '
', '#' . $serendipity['POST']['group'] . ', ' . $serendipity['POST']['name']);
}
@@ -30,7 +30,7 @@ if (isset($_POST['SAVE_NEW']) && serendipity_checkFormToken()) {
if (isset($_POST['SAVE_EDIT']) && serendipity_checkFormToken()) {
$perms = serendipity_getAllPermissionNames();
serendipity_updateGroupConfig($serendipity['POST']['group'], $perms, $serendipity['POST'], false, $serendipity['POST']['forbidden_plugins'], $serendipity['POST']['forbidden_hooks']);
- printf('' . MODIFIED_GROUP . '
', $serendipity['POST']['name']);
+ printf(' . ')
' . MODIFIED_GROUP . '
', $serendipity['POST']['name']);
}
if ( $serendipity['GET']['adminAction'] != 'delete' ) {
diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php
index 649cbcb1..6215de77 100644
--- a/include/admin/importers/movabletype.inc.php
+++ b/include/admin/importers/movabletype.inc.php
@@ -446,7 +446,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
unset($entry['s9y_comments']);
if ( !is_int($r = serendipity_updertEntry($entry)) ) {
- echo '' . $r . '
';
+ echo ' . ')
' . $r . '
';
} else {
$this->debug('Saved entry ' . $r . ' (' . $entry['title'] . ')');
$entry['id'] = $r;
@@ -456,7 +456,7 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
$cid = serendipity_db_insert_id('comments', 'id');
serendipity_approveComment($cid, $entry['id'], true);
} else {
- echo '' . $rc . '
';
+ echo ' . ')
' . $rc . '
';
}
}
// Let the plugins do some additional stuff. Here it's used with
diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index 54935ed1..90702a7f 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -71,7 +71,7 @@ if ( sizeof($_POST) > 1 && $serendipity['GET']['step'] == 3 ) {
if ( is_array($errors = serendipity_checkInstallation()) ) {
foreach ( $errors as $error ) {
- echo ''. $error .'
';
+ echo ' . ')
'. $error .'
';
}
$from = $_POST;
@@ -423,12 +423,12 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
-
+
0 ) { ?>
-
+
:
@@ -508,16 +508,16 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
} else {
echo '
' . FAILED . '';
foreach ( $errors as $error ) {
- echo '
'. $error .'
';
+ echo '
 . ')
' . $error .'
';
}
}
if ( serendipity_updateConfiguration() ) {
- echo '
'. SERENDIPITY_INSTALLED .'
';
+ echo '
. ')
' . SERENDIPITY_INSTALLED .'
';
echo '
';
echo '
'. THANK_YOU_FOR_CHOOSING .'
';
} else {
- echo '
'. ERROR_DETECTED_IN_INSTALL .'
';
+ echo '
 . ')
'. ERROR_DETECTED_IN_INSTALL .'
';
}
}
diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php
index 6374b7eb..558a7793 100644
--- a/include/admin/overview.inc.php
+++ b/include/admin/overview.inc.php
@@ -39,5 +39,5 @@ if ($output['show_links']) {
echo '' . "\n";
echo '
' . "\n";
}
-echo '' . $output['welcome'] . '';
+echo '' . $output['welcome'] . '
';
echo $output['more'];
\ No newline at end of file
diff --git a/include/admin/personal.inc.php b/include/admin/personal.inc.php
index 143b4eaa..ed970a1b 100644
--- a/include/admin/personal.inc.php
+++ b/include/admin/personal.inc.php
@@ -16,11 +16,11 @@ if ($serendipity['GET']['adminAction'] == 'save' && serendipity_checkFormToken()
$config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
if ( (!serendipity_checkPermission('adminUsersEditUserlevel') || !serendipity_checkPermission('adminUsersMaintainOthers') )
&& (int)$_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
- echo '' . CREATE_NOT_AUTHORIZED_USERLEVEL . '
';
+ echo ' . ')
' . CREATE_NOT_AUTHORIZED_USERLEVEL . '
';
} elseif (empty($_POST['username'])) {
- echo '' . USERCONF_CHECK_USERNAME_ERROR . '
';
+ echo ' . ')
' . USERCONF_CHECK_USERNAME_ERROR . '
';
} elseif (!empty($_POST['password']) && $_POST['check_password'] != $_SESSION['serendipityPassword'] && md5($_POST['check_password']) != $_SESSION['serendipityPassword']) {
- echo '' . USERCONF_CHECK_PASSWORD_ERROR . '
';
+ echo ' . ')
' . USERCONF_CHECK_PASSWORD_ERROR . '
';
} else {
$valid_groups = serendipity_getGroups($serendipity['authorid'], true);
@@ -53,7 +53,7 @@ if ($serendipity['GET']['adminAction'] == 'save' && serendipity_checkFormToken()
}
/*
if (count($_POST[$item['var']]) < 1) {
- echo '' . WARNING_NO_GROUPS_SELECTED . '
';
+ echo ' . ')
' . WARNING_NO_GROUPS_SELECTED . '
';
} else {
serendipity_updateGroups($_POST[$item['var']], $serendipity['authorid'], false);
}
@@ -91,7 +91,7 @@ if ($serendipity['GET']['adminAction'] == 'save' && serendipity_checkFormToken()
}
$from = $_POST;
?>
-
+
diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index 53e7e17d..b894beb2 100644
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -102,6 +102,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
0 ) { ?>
+
; ?>)
\n";
echo "
\n";
@@ -112,7 +113,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
?>
-
+