Changeset 12330

Timestamp:

09/17/07 16:14:10 (1 year ago)

Author:

juhana

Message:

Minor updates

Files:

• trunk/midcom/net.nemein.teams/config/config.inc (modified) (1 diff)
• trunk/midcom/net.nemein.teams/handler/admin.php (modified) (5 diffs)
• trunk/midcom/net.nemein.teams/handler/team.php (modified) (5 diffs)
• trunk/midcom/net.nemein.teams/locale/default.en.txt (modified) (1 diff)
• trunk/midcom/net.nemein.teams/plugins/midgard_admin_sitewizard_plugin.php (modified) (2 diffs)
• trunk/midcom/net.nemein.teams/style/manage_system.php (added)
• trunk/midcom/net.nemein.teams/style/teams_pending_list_end.php (modified) (1 diff)
• trunk/midcom/net.nemein.teams/style/teams_pending_list_item.php (modified) (1 diff)
• trunk/midcom/net.nemein.teams/style/teams_pending_list_start.php (modified) (1 diff)
• trunk/midcom/net.nemein.teams/viewer.php (modified) (3 diffs)

trunk/midcom/net.nemein.teams/config/config.inc

@@ -20 +20 @@
-'display_teams_per_page' => 1,
-'display_pages' => 10, 
+'max_players_per_team' => 10,
-
+
+// Are these used for anything...=)
-'private_pendings_url' => '/leet_teams/pending',
-'private_pendings_link' => 'approve/decline',

trunk/midcom/net.nemein.teams/handler/admin.php

@@ -77 +77 @@
-    function _handler_manage_delete($handler_id, $args, &$data)
-    {    
+        $_MIDCOM->auth->require_admin_user();
+    
-        if (isset($_POST['remove']))
-        {     
@@ -88 +90 @@
-                   // TODO: handle this
-                }
-                
-                print_r($args);
-                print_r($teams);
-                
-                if (count($teams) > 0)
@@ -114 +113 @@
-                        // We might need to delete this for real
-                        $team_topic->navnoentry = true;
+                        //$team_topic->update();
-                                     
-                        $team->delete();
@@ -135 +135 @@
-    function _handler_manage_team($handler_id, $args, &$data)
-    {
+        $_MIDCOM->auth->require_admin_user();
-    
-        $qb = net_nemein_teams_team_dba::new_query_builder();
@@ -147 +148 @@
-    
-        return true;
+    }
+    
+    function _handler_manage_system($handler_id, $args, &$data)
+    {
+        $_MIDCOM->auth->require_admin_user();
+    
+        return true;
+    }
+    
+    function _show_manage_system($handler_id, &$data)
+    {
+        midcom_show_style('manage_system');
-    }
-    

trunk/midcom/net.nemein.teams/handler/team.php

@@ -421 +421 @@
-        $qb = net_nemein_teams_team_dba::new_query_builder();
-        $qb->add_constraint('managerguid', '=', $_MIDCOM->auth->user->guid);
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if (isset($_POST['approve_pending']))
-        {
-            $teams = $qb->execute();
-        
-            foreach($_POST as $key => $value)
-            {
@@ -454 +463 @@
-            }
-        }     
+        }
+        else
+        {
+            $this->_request_data['team_full'] = true;
+        } 
-        
-        if ($qb->count() > 0)
@@ -491 +505 @@
-                if (!$members = $qb->execute())
-                {
-
+ return false;
-                }
-                else
@@ -519 +533 @@
-    function _show_error($handler_id, &$data)
-    {
-net team_creation_for
+tea
-    }
-
@@ -542 +556 @@
-        midcom_show_style('teams_pending_list_start');
-    
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    

trunk/midcom/net.nemein.teams/locale/default.en.txt

@@ -58 +58 @@
-Approve
----STRINGEND
+
+---STRING team is full
+Team is full at the moment
+---STRINGEND

trunk/midcom/net.nemein.teams/plugins/midgard_admin_sitewizard_plugin.php

@@ -168 +168 @@
-                $this->_logger->log("Team home folder created by " . $_MIDCOM->auth->user->_storage->username, $this->_team_guid);
-
-//$_MIDCOM->relocate($my_way_ho
+$_MIDCOM->relocate($this->_home_na
-
-            }
@@ -178 +178 @@
-                $e->error();
-                echo "</p>";
+                $_MIDCOM->relocate('error');
-        }
-           echo "</pre>";

trunk/midcom/net.nemein.teams/style/teams_pending_list_end.php

@@ -2 +2 @@
-//$data =& $_MIDCOM->get_custom_context_data('request_data');
-?>
-
+
-<br/>
-<input type="submit" name="approve_pending" value="<?php echo $data['l10n']->get('approve'); ?>"/>

trunk/midcom/net.nemein.teams/style/teams_pending_list_item.php

@@ -5 +5 @@
-
-<?php 
-
+
-echo $data['player_username'];
-echo " <input type=\"checkbox\" name=\"{$data['pending']->playerguid}\"/>";
-
+
-?>
-

trunk/midcom/net.nemein.teams/style/teams_pending_list_start.php

@@ -6 +6 @@
-
-<form method="post" name="net_nemein_teams_pending">
+<ul>

trunk/midcom/net.nemein.teams/viewer.php

@@ -73 +73 @@
-        );
-        
+        // Manage / System
+        $this->_request_switch['manage_system'] = array
+        (
+            'handler' => Array('net_nemein_teams_handler_admin', 'manage_system'),
+                'fixed_args' => Array('manage_system'),
+        );  
+              
-        // Error /
-        $this->_request_switch['error'] = array
@@ -317 +324 @@
-    function _populate_node_toolbar()
-    {   
-    
+
-        if ($this->_content_topic->can_do('midgard:create'))
-        {
@@ -334 +341 @@
-        }
-        */
+        
+        if ($_MIDCOM->auth->require_admin_user())
+        {
+            $this->_node_toolbar->add_item
+            (
+                array
+                (
+                    MIDCOM_TOOLBAR_URL => 'manage',
+                    MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('manage teams'),
+                    MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('manage teams'),
+                    MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',
+                )
+            );
+            $this->_node_toolbar->add_item
+            (
+                array
+                (
+                    MIDCOM_TOOLBAR_URL => 'manage_system',
+                    MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('manage system'),
+                    MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('manage system'),
+                    MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',
+                )
+            );        
+        }
+        
-        if (   $this->_topic->can_do('midgard:update')
-            && $this->_topic->can_do('midcom:component_config'))