[Openupload-svn-update] SF.net SVN: openupload:[119] trunk/lib/modules/default/admin.inc.php

[<ts...@us...>]

Revision: 119
          http://openupload.svn.sourceforge.net/openupload/?rev=119&view=rev
Author:   tsdogs
Date:     2008-11-06 12:39:02 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
Add initial language administration
fix bug #2225762 (group editing)
fix bug #2229204 (user password change admin)

Modified Paths:
--------------
    trunk/lib/modules/default/admin.inc.php

Modified: trunk/lib/modules/default/admin.inc.php
===================================================================
--- trunk/lib/modules/default/admin.inc.php	2008-11-06 12:36:44 UTC (rev 118)
+++ trunk/lib/modules/default/admin.inc.php	2008-11-06 12:39:02 UTC (rev 119)
@@ -51,6 +51,13 @@
         3 => "bannededit",
         4 => "banneddel",
       ),
+      "adminlangs" => array (
+        1 => "langs",
+        2 => "langadd",
+        3 => "langedit",
+        4 => "langdel",
+        5 => "langtoggle",
+      ),
     );
 
 var $page;
@@ -156,8 +163,9 @@
     $groups = app()->auth->groupinfo();
     $this->tpl->assign('groups',$groups);
     if (isset($_POST['login'])) {
+      $pwd = false;
       $user = app()->auth->userinfo($_POST['login']);
-      $user = $user[0];
+      //$user = $user[0];
       $user['name']=$_POST['editusername'];
       $user['group_name']=$_POST['editusergroup'];
       $user['email']=$_POST['edituseremail'];
@@ -172,15 +180,17 @@
           app()->error('Passwords do not correspond!');
           $error = true;
         }
-        if (!$error)
-          $user['password']=crypt($_POST['edituserpassword']);
+        if (!$error) {
+          $user['password']=$_POST['edituserpassword'];
+          $pwd = true;
+        }
       }
       if (!validEmail($_POST['edituseremail'])) {
         app()->error('e-mail is not a valid address!');
         $error = true;
       }
       if (!$error)  {
-        app()->auth->useredit($user);
+        app()->auth->useredit($user,$pwd);
         /* redirect */
         $this->nextStep(1);
       }
@@ -202,31 +212,40 @@
   function groupadd() {
     global $_POST;
 
-    if (isset($_POST['addgroupname'])) {
-      $group['name']=$_POST['addgroupname'];
-      $group['description']=$_POST['addgroupdescription'];
-      if ($group['name']!='') {
-        app()->auth->groupadd($group);
-        $this->nextStep(1);
-      } else {
-        app()->error(tr('Please provide a valid group name!'));
+    if (app()->auth->features['groupadmin']=='yes') {
+      if (isset($_POST['addgroupname'])) {
+        $group['name']=$_POST['addgroupname'];
+        $group['description']=$_POST['addgroupdescription'];
+        if ($group['name']!='') {
+          app()->auth->groupadd($group);
+          $this->nextStep(1);
+        } else {
+          app()->error(tr('Please provide a valid group name!'));
+        }
       }
+      app()->tpl->assign('group',$group);
+    } else {
+      app()->error(tr('Group administration not supported by Auth Module'));
     }
-    app()->tpl->assign('group',$group);
   }
 
   function groupedit() {
     global $_POST;
     global $_GET;
 
-    $group = app()->auth->groupinfo();
-    $group = $group[0];
-    if (isset($_POST['editgroupname'])) {
-      $group['name']=$_POST['editgroupname'];
-      $group['description']=$_POST['editgroupdescription'];
-      $this->nextStep(1);
+    if (app()->auth->features['groupadmin']=='yes') {
+      $id = isset($_POST['editgroupname'])?$_POST['editgroupname']:$_GET['id'];
+      $group = app()->auth->groupinfo($id);
+      if (isset($_POST['editgroupname'])) {
+        $group['name']=$_POST['editgroupname'];
+        $group['description']=$_POST['editgroupdescription'];
+        app()->auth->groupedit($group);
+        $this->nextStep(1);
+      }
+      app()->tpl->assign('group',$group);
+    } else {
+      app()->error(tr('Group administration not supported by Auth Module'));
     }
-    app()->tpl->assign('group',$group);
   }
 
   function groupdel() {
@@ -562,6 +581,53 @@
   }
   function banneddown() {
   }
-  
+
+  function langs() {
+    $langs = app()->db->read('langs');
+    $this->tpl->assign('langlist',$langs);
+  }
+
+  function langadd() {
+  }
+
+  function langedit() {
+    global $_GET;
+
+    if (isset($_POST['id'])) {
+      $lang = app()->db->read('langs',array('id' => $_POST['id']));
+      $lang = $lang[0];
+      $lang['name']=$_POST['editlangname'];
+      $lang['locale']=$_POST['editlanglocale'];
+      $lang['browser']=$_POST['editlangbrowser'];
+      $lang['charset']=$_POST['editlangcharset'];
+      $lang['active']=isset($_POST['editlangactive'])?1:0;
+      //$this->tpl->assign('lang' , $lang[0]);
+      app()->db->update('langs',$lang,array('id' => $_POST['id']));
+      $this->nextStep(1);
+    } else if (isset($_GET['id'])) {
+      $lang = app()->db->read('langs',array('id' => $_GET['id']));
+      $this->tpl->assign('lang', $lang[0]);
+    } else {
+      $this->nextStep(1);
+    }
+  }
+ 
+  function langdel() {
+  }
+
+  function langtoggle() {
+    global $_GET;
+
+    if (isset($_GET['id'])) {
+      $active=$_GET['active']==1?0:1;
+      $lang = app()->db->read('langs',array('id' => $_GET['id']));
+      $lang = $lang[0];
+      if ($lang['id']==$_GET['id']) {
+        $lang['active']=$active;
+        app()->db->update('langs',$lang,array('id' => $_GET['id']),array('active'));
+      }
+    }
+    $this->nextStep(1);
+  }
 }
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.