|
From: Garvin H. <gar...@us...> - 2004-05-26 17:02:47
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4992 Modified Files: NEWS serendipity_admin_upgrader.inc.php serendipity_admin_users.inc.php serendipity_config.inc.php serendipity_functions.inc.php serendipity_functions_config.inc.php Log Message: User manager: New user right 'publish' which controls whether a user is allowed to publish entries or only drafts. NOTICE: requires DB layout upgrade. Index: serendipity_admin_users.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- serendipity_admin_users.inc.php 22 Apr 2004 18:50:55 -0000 1.6 +++ serendipity_admin_users.inc.php 26 May 2004 17:02:32 -0000 1.7 @@ -75,6 +75,7 @@ ); } printf('<strong>' . MODIFIED_USER . '</strong>', $_POST['username']); + echo '<br />'; } } @@ -99,7 +100,7 @@ <tr> <td><?php echo htmlspecialchars($user['username']); ?></td> <td width="200"><?php echo $user['userlevel']; ?></td> - <td align="right"> + <td align="right"> <form action="?serendipity[adminModule]=users" method="post"> <input type="hidden" name="serendipity[user]" value="<?php echo $user['authorid']; ?>"> <input type="submit" name="EDIT" value="<?php echo EDIT; ?>" /> Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- serendipity_config.inc.php 25 May 2004 16:16:14 -0000 1.75 +++ serendipity_config.inc.php 26 May 2004 17:02:32 -0000 1.76 @@ -12,7 +12,7 @@ } include_once(S9Y_INCLUDE_PATH . 'compat.php'); -$serendipity['version'] = '0.6.3-CVS'; +$serendipity['version'] = '0.6.4-CVS'; $serendipity['production'] = 1; $serendipity['rewrite'] = 'none'; $serendipity['messagestack'] = array(); Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.273 retrieving revision 1.274 diff -u -d -r1.273 -r1.274 --- serendipity_functions.inc.php 26 May 2004 12:06:58 -0000 1.273 +++ serendipity_functions.inc.php 26 May 2004 17:02:32 -0000 1.274 @@ -2048,6 +2048,10 @@ $entry['authorid'] = $serendipity['authorid']; } + if (!$_SESSION['serendipityRightPublish']) { + $entry['isdraft'] = 'true'; + } + $res = serendipity_db_insert('entries', $entry); if ($res) @@ -2064,6 +2068,10 @@ return; } + if (!$_SESSION['serendipityRightPublish']) { + unset($entry['isdraft']); + } + $res = serendipity_db_update('entries', array('id' => $entry['id']), $entry); $newEntry = 0; } @@ -2207,7 +2215,7 @@ <tr> <td><input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlspecialchars($entry['title']) : ''; ?>" size="72" /></td> <td align="right"><select name="serendipity[isdraft]"> - <option value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option> + <?php if ($_SESSION['serendipityRightPublish']) { ?><option value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option><?php } ?> <option value="true" <?php echo $draftD; ?>><?php echo DRAFT; ?></option> </select> </td> @@ -2342,7 +2350,7 @@ } $query = "SELECT DISTINCT - email, authorid, userlevel + email, authorid, userlevel, right_publish FROM $serendipity[dbPrefix]authors WHERE @@ -2351,12 +2359,13 @@ $row = serendipity_db_query($query, true, 'assoc'); if (is_array($row)) { - $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username; - $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = $password; - $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; - $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; - $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; - $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; + $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username; + $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = $password; + $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; + $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; + $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; + $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; + $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish']; serendipity_load_configuration($serendipity['authorid']); return true; } else { Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- NEWS 26 May 2004 12:06:59 -0000 1.133 +++ NEWS 26 May 2004 17:02:32 -0000 1.134 @@ -3,8 +3,12 @@ Version 0.7 () ------------------------------------------------------------------------ + * User manager: New user right 'publish' which controls whether a + user is allowed to publish entries or only drafts. + (garvinhicking) [DB Layout change -> 0.6.4] + * Added new plugin "serendipity_event_karma": Allows karma voting - for each article with a flexible voting period.(garvinhicking) + for each article with a flexible voting period. (garvinhicking) * Added event hook-variable for displaying an article footer. Enhanced Plugin API to allow passing a second array of data to the Index: serendipity_functions_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serendipity_functions_config.inc.php 13 Apr 2004 10:00:36 -0000 1.8 +++ serendipity_functions_config.inc.php 26 May 2004 17:02:34 -0000 1.9 @@ -57,6 +57,7 @@ $copy_to_s9y = false; break; + case 'right_publish': case 'mail_comments': case 'mail_trackbacks': $val = (serendipity_db_bool($val) ? 1 : '0'); Index: serendipity_admin_upgrader.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serendipity_admin_upgrader.inc.php 26 May 2004 15:40:23 -0000 1.8 +++ serendipity_admin_upgrader.inc.php 26 May 2004 17:02:32 -0000 1.9 @@ -68,6 +68,7 @@ } elseif ($serendipity['GET']['action'] == 'upgrade') { printf(SERENDIPITY_UPGRADER_NOW_UPGRADED, $serendipity['version']); } + echo '<br />'; printf(SERENDIPITY_UPGRADER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>'); $_SESSION['serendipityAuthedUser'] = false; session_destroy(); |
