? translations
Index: simplenews.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.install,v
retrieving revision 1.27
diff -u -p -r1.27 simplenews.install
--- simplenews.install	2 Jan 2009 14:31:48 -0000	1.27
+++ simplenews.install	3 Jan 2009 10:57:59 -0000
@@ -559,4 +559,21 @@ function simplenews_update_6006() {
   }
   
   return $ret;
+}
+
+/**
+ * Rename old permissions.
+ */
+function simplenews_update_6007() {
+  $ret = array();
+  $result = db_query("SELECT rid, perm FROM {permission} ORDER BY rid");
+  while ($role = db_fetch_object($result)) {
+    $patterns = array('/create newsletter/', '/edit own newsletter/', '/edit any newsletter/', '/delete own newsletter/', '/delete any newsletter/');
+    $replacements = array('create simplenews content', 'edit own simplenews content', 'edit any simplenews content' ,'delete own simplenews content', 'delete any simplenews content');
+    $renamed_permission = preg_replace($patterns, $replacements, $role->perm);
+    if ($renamed_permission != $role->perm) {
+      $ret[] = update_sql("UPDATE {permission} SET perm = '$renamed_permission' WHERE rid = $role->rid");
+    }
+  }
+  return $ret;
 }
\ No newline at end of file
Index: simplenews.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simplenews/simplenews.module,v
retrieving revision 1.186
diff -u -p -r1.186 simplenews.module
--- simplenews.module	2 Jan 2009 12:01:17 -0000	1.186
+++ simplenews.module	3 Jan 2009 10:58:02 -0000
@@ -62,35 +62,7 @@ define('SIMPLENEWS_SEND_TIME_LIMIT', 0.8
  * Implementation of hook_perm().
  */
 function simplenews_perm() {
-  return array('create newsletter', 'edit own newsletter', 'edit any newsletter', 'delete own newsletter', 'delete any newsletter', 'administer newsletters', 'administer simplenews subscriptions', 'administer simplenews settings', 'send newsletter', 'subscribe to newsletters');
-}
-
-/**
- * Implementation of hook_access().
- */
-function simplenews_access($op, $node) {
-  global $user;
-  if ($op == 'create') {
-    if (user_access('create newsletter')) {
-      return TRUE;
-    }
-  }
-  if ($op == 'update') {
-    if (user_access('edit any newsletters')) {
-      return TRUE;
-    }
-    elseif (user_access('edit own newsletter') && $user->uid == $node->uid) {
-      return TRUE;
-    }
-  }
-  if ($op == 'delete') {
-    if (user_access('delete any newsletters')) {
-      return TRUE;
-    }
-    elseif (user_access('delete own newsletter') && $user->uid == $node->uid) {
-      return TRUE;
-    }
-  }
+  return array('administer newsletters', 'administer simplenews subscriptions', 'administer simplenews settings', 'send newsletter', 'subscribe to newsletters');
 }
 
 /**