Changeset 78

Timestamp:

10/23/06 12:59:22 (2 years ago)

Author:

moensch

Message:

Importing com_mls_teams 0.1.1 into trunk

Files:

• trunk/com_mls_teams/admin.mls_teams.html.php (modified) (3 diffs)
• trunk/com_mls_teams/admin.mls_teams.php (modified) (6 diffs)
• trunk/com_mls_teams/install/comupgrade.xml (modified) (2 diffs)
• trunk/com_mls_teams/install/upgrade_0.1.1.php (added)
• trunk/com_mls_teams/lang/dutch.php (deleted)
• trunk/com_mls_teams/lang/english.php (modified) (3 diffs)
• trunk/com_mls_teams/lang/german.php (modified) (3 diffs)
• trunk/com_mls_teams/mls_teams.html.php (modified) (3 diffs)
• trunk/com_mls_teams/mls_teams.php (modified) (3 diffs)
• trunk/com_mls_teams/mls_teams.xml (modified) (3 diffs)
• trunk/com_mls_teams/version (deleted)

trunk/com_mls_teams/admin.mls_teams.html.php

@@ -14 +14 @@
-                        <tr>
-                                <td align="center" style="background-color: #F5F5F5; border: 1px solid #D5D5D5">
-Mambo
-Samuel Suter &lt;<a href="mailto:samuel.suter@gmx.ch">samuel.suter@gmx.ch
+Joomla
+- 2006 Samuel Suter &lt;<a href="mailto:samuel.suter@mylansite.org">samuel.suter@mylansite.org
-                                This is Free Software released under the GNU/GPL License.
-                                </td>
@@ -89 +89 @@
-        }
-        
-
-
+leaguesdata, $members, $lists, $
+, $task
-                $l->setBlock("teams");
+                $baseurl = "index2.php?option=".$option."&act=".$act."&task=".$task."&cid[0]=".$row->id;
-                ?>
-                <form action="index2.php" method="POST" name="adminForm">
@@ -99 +100 @@
-                </tr>
-                </table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                <tr>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </tr>
-                </table>
-                <table class="adminlist">
-                <tr>
-                        <th width="5">#</td>
-                        <th width="20"><input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count($rows); ?>);" /></th>
-                        <th class="title" width="200"><?=$l->m("team");?></th>
-                        <th class="title" width="200"><?=$l->m("user");?></th>
-                        <th><?=$l->m("leader");?></th>
-                        <th>&nbsp;</th>
-                </tr>
-                <?php
-                $k = 0;
-                
-                for ($i=0, $n=count($rows); $i < $n; $i++) {
-                        $row = $rows[$i];
-                        $img = $row->leader ? "tick.png" : "publish_x.png";
-                        $task = $row->leader ? "unset_leader" : "set_leader";
-                        ?>
-                        <tr class="<?php echo "row$k"; ?>">
-                                <td><?php echo $pageNav->rowNumber( $i ); ?></td>
-                                <td width="20">
-                                        <input type="checkbox" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $row->id; ?>" onclick="isChecked(this.checked);" />
-                                </td>
-                                <td><?php echo $row->teamname; ?></td>
-                                <td><a href="#edit" onclick="return listItemTask('cb<?php echo $i;?>','edit')"><?php echo $row->username; ?> (<?php echo $row->nickname; ?>)</a></td>
-                                <td align="center"><a href="javascript: void(0);" onClick="return listItemTask('cb<?php echo $i;?>','<?php echo $task;?>')"><img src="images/<?php echo $img;?>" width="12" height="12" border="0" alt="" /></a></td>
-                                <td>&nbsp;</td>
-                        </tr>
-                        <?php
-                        $k = 1 - $k;
-                }
-                ?>
-                </table>
-                <?php echo $pageNav->getListFooter(); ?>
-                <input type="hidden" name="option" value="<?php echo $option; ?>" />
-                <input type="hidden" name="act" value="<?php echo $act; ?>" />
-                <input type="hidden" name="task" value="" />
-                <input type="hidden" name="boxchecked" value="0" />
-                </form>
-                <?php
-                HTML_MLS_teams::printFooter($option);
-        }
-        
-        function editMember(&$row, $lists, $option, $act) {
-                global $l;
-                $l->setBlock("teams");
-                ?>
-                <form action="index2.php" method="POST" name="adminForm">
-                <table class="adminheading">
-                <tr>
-                        <th>myLANsite Teams: <?php echo $row->id ? $l->m("edit_team_member") : $l->m("add_team_member");?></th>
-                </tr>
-                </table>
-                <table class="adminform">
-                        <tr> 
-                                <td width="20%" valign="top" align="right"><?=$l->m("team") ?>:</td>
-                                <td width="80%"><?php echo $lists["teamid"]; ?></td>
-                        </tr>
-                        <tr> 
-                                <td valign="top" align="right"><?=$l->m("user") ?>:</td>
-                                <td><?php echo $lists["userid"]; ?></td>
-                        </tr>
-                        <tr> 
-                                <td valign="top" align="right"><?=$l->m("leader") ?>:</td>
-                                <td><?php echo $lists["leader"]; ?></td>
-                        </tr>
-                </table>
-                <input type="hidden" name="option" value="<?php echo $option; ?>" />

trunk/com_mls_teams/admin.mls_teams.php

@@ -12 +12 @@
-require_once( $mainframe->getPath( 'admin_html' ) );
-require_once( $mainframe->getPath( 'class' ) );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-if(file_exists($mosConfig_absolute_path."/administrator/components/".$option."/version")) {
-        $act = "update";
@@ -34 +39 @@
-                                break;
-                        case "edit":
+                                if(@$_REQUEST["teamtask"]) {
+                                        switch($_REQUEST["teamtask"]) {
+                                        case "remove":
+                                                //remove member
+                                                $database->setQuery( "DELETE FROM `#__mls_teams_members` WHERE `id`='".$_REQUEST["memberid"]."'" );
+                                                $database->query();
+                                                break;
+                                        case "leader":
+                                                //promote/demote as leader
+                                                $database->setQuery( "SELECT `leader` FROM `#__mls_teams_members` WHERE `id`='".$_REQUEST["memberid"]."'" );
+                                                if($database->loadResult() == 1) {
+                                                        $leader = 0;
+                                                } else {
+                                                        $leader = 1;
+                                                }
+                                                $database->setQuery( "UPDATE `#__mls_teams_members` SET `leader`='".$leader."' WHERE `id`='".$_REQUEST["memberid"]."'" );
+                                                $database->query();
+                                                break;
+                                        default:
+                                                //add member
+                                                $data = array(  "teamid" => $_POST["id"],
+                                                                        "userid" => $_POST["userid"],
+                                                                        "leader" => 0);
+                                                $row = new mosMLS_teams_member( $database );
+                                                $row->save($data);
+                                                //Set the cid var so the edit function loads the correct team
+                                                $cid[0] = $_POST["id"];
+                                                break;
+                                        }
+                                }
-                                editMLS_teams_teams($cid[0],$option,$act);
-                                break;
@@ -50 +85 @@
-                }
-                break;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        global $database, $my, $mainframe, $l, $mosConfig_offset;
-        
@@ -86 +98 @@
-        if ($id) {
-                // do stuff for existing records
+                //Members
+                $database->setQuery( "SELECT m.*,u.username AS `nickname`,u.name AS `username` FROM `#__mls_teams_members` AS `m`"
+                                                ."\n INNER JOIN `#__users` AS `u` ON u.id=m.userid"
+                                                ."\n WHERE m.teamid='".$id."'"
+                                                ."\n ORDER BY u.username ASC" );
+                $members = $database->loadObjectList();
-                
+                //select list to add members
+                $database->setQuery( "SELECT `id`,`username`,`name` FROM `#__users` ORDER BY `name` ASC" );
+                $temp = $database->loadObjectList();
+                $opt[] = mosHTML::makeOption('0', $l->m("select_user","general"));
+                foreach($temp as $user) {
+                        $opt[] = mosHTML::makeOption($user->id, $user->name . " (" . $user->username . ")");
+                }
+                $lists["userid"] = mosHTML::selectList($opt, 'userid', ' class="inputbox"', 'value', 'text', '0');
-        } else {
-                // do stuff for new records
-                $row->founded = date( "Y-m-d H:i:s", time()+$mosConfig_offset*60*60 );
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        global $database, $my, $mainframe, $l;
-        
@@ -123 +158 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -188 +236 @@
-};
-
-/** START Members */
-function editMLS_teams_members($id,$option,$act) {
-        global $database, $my, $mainframe, $l;
-        $l->setBlock("general");
-        $row = new mosMLS_teams_member( $database );
-        
-        // load the row from the db table
-        $row->load( $id );
-        
-        if ($id) {
-                // do stuff for existing records
-                $lists = array();
-                $lists["leader"] = mosHTML::yesnoRadioList('leader', ' class="inputbox"', $row->leader);
-                $database->setQuery( "SELECT `id`,`name` FROM `#__mls_teams` WHERE `id`='".$row->teamid."'" );
-                $database->loadObject($team);
-                $lists["teamid"] = $team->name;
-                
-                $database->setQuery("SELECT `id`,`name`, `username` FROM `#__users` WHERE `id`='".$row->userid."'");
-                $database->loadObject($user);
-                $lists["userid"] = $user->name . " (" . $user->username . ")";
-        } else {
-                // do stuff for new records
-                $row->teamid = $mainframe->getUserState("filter_teamid{$option}members");
-                $row->leader = 0;
-                
-                //build the html select lists
-                $lists = array();
-                $lists["leader"] = mosHTML::yesnoRadioList('leader', ' class="inputbox"', $row->leader);
-                
-                $database->setQuery( "SELECT `id`,`name` FROM `#__mls_teams` ORDER BY `name` ASC" );
-                $temp = $database->loadObjectList();
-                $opt[] = mosHTML::makeOption('0', $l->m("select_team","general"));
-                foreach($temp as $team) {
-                        $opt[] = mosHTML::makeOption($team->id, $team->name);
-                }
-                $lists["teamid"] = mosHTML::selectList($opt, 'teamid', ' class="inputbox"', 'value', 'text', $row->teamid);
-                unset($opt);
-                
-                $database->setQuery( "SELECT `id`,`username`,`name` FROM `#__users` ORDER BY `name` ASC" );
-                $temp = $database->loadObjectList();
-                $opt[] = mosHTML::makeOption('0', $l->m("select_user","general"));
-                foreach($temp as $user) {
-                        $opt[] = mosHTML::makeOption($user->id, $user->name . " (" . $user->username . ")");
-                }
-                $lists["userid"] = mosHTML::selectList($opt, 'userid', ' class="inputbox"', 'value', 'text', $row->userid);
-        }
-        
-        
-        HTML_MLS_teams::editMember($row, $lists, $option, $act);
-};
-
-function saveMLS_teams_members($option,$act) {
-        global $database, $my, $mainframe, $l;
-        
-        $row = new mosMLS_teams_member( $database );
-        $row->save($_POST);
-        
-        mosRedirect( "index2.php?option=$option&act=$act" );
-};
-
-function removeMLS_teams_members($cid,$option,$act) {
-        global $database, $my, $mainframe, $l;
-        
-        if (count( $cid )) {
-                $cids = implode( ',', $cid );
-                $database->setQuery( "DELETE FROM `#__mls_teams_members` WHERE `id` IN ($cids)" );
-                if (!$database->query()) {
-                        echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
-                }
-        }
-        
-        mosRedirect( "index2.php?option=$option&act=$act" );
-};
-
-function listMLS_teams_members($option, $act) {
-        global $database, $my, $mainframe, $l, $mosConfig_list_limit;
-        
-        //get filter values
-        $limit = $mainframe->getUserStateFromRequest( "viewlistlimit", 'limit', $mosConfig_list_limit );
-        $limitstart = $mainframe->getUserStateFromRequest( "members{$option}limitstart", 'limitstart', 0 );
-        $search = $mainframe->getUserStateFromRequest( "search{$option}members", 'search', '' );
-        $search = $database->getEscaped( trim( strtolower( $search ) ) );
-        $teamid = $mainframe->getUserStateFromRequest( "filter_teamid{$option}members", 'teamid', 0 );
-        
-        //define filter
-        $where = "";
-        $words = explode(" ",$search);
-        foreach($words as $word) {
-                if($word) {
-                        $op = $where ? "AND" : "WHERE";
-                        $where .= " $op (c.name LIKE '%$word%' OR c.tag LIKE '%$word%' OR c.id LIKE '%$word%' OR u.username LIKE '%$word%' OR u.name LIKE '%$word%' OR u.id LIKE '%$word%')";
-                }
-        }
-        $op = $where ? "AND" : "WHERE";
-        $where .= $teamid ? " $op m.teamid = '$teamid'" : "";
-        
-        // get the total number of records
-        $database->setQuery( "SELECT COUNT(*) FROM `#__mls_teams_members` AS `m`"
-                                        ."\n INNER JOIN `#__users` AS `u` ON u.id=m.userid"
-                                        ."\n INNER JOIN `#__mls_teams` AS `c` ON c.id=m.teamid $where"
-                                        ."\n ORDER BY c.name,m.leader,u.username ASC" );
-        $total = $database->loadResult();
-        
-        //page navigation
-        require_once( "includes/pageNavigation.php" );
-        $pageNav = new mosPageNav( $total, $limitstart, $limit  );
-        
-        // build the html select lists
-        $team_select = HTML_MLS_teams::showTeamSelect($teamid,$option,$act);
-        
-        //get data
-        $database->setQuery( "SELECT m.*,u.username AS `nickname`,u.name AS `username`,c.name AS `teamname` FROM `#__mls_teams_members` AS `m`"
-                                        ."\n INNER JOIN `#__users` AS `u` ON u.id=m.userid"
-                                        ."\n INNER JOIN `#__mls_teams` AS `c` ON c.id=m.teamid $where"
-                                        ."\n ORDER BY c.name ASC,m.leader DESC,u.username ASC"
-                                        ."\nLIMIT $pageNav->limitstart, $pageNav->limit");
-        $rows = $database->loadObjectList();
-        
-        HTML_MLS_teams::listMembers($rows, $pageNav, $search, $team_select, $option, $act);
-};
-
-function leaderMLS_teams_members($cid, $value, $option, $act) {
-        global $database;
-        
-        $database->setQuery( "UPDATE `#__mls_teams_members` SET `leader`='".$value."' WHERE `id` IN (".implode($cid).")" );
-        $database->query();
-        
-        mosRedirect( "index2.php?option=$option&act=$act" );
-}
-?>

trunk/com_mls_teams/install/comupgrade.xml

@@ -1 +1 @@
-<?xml version="1.0" ?>
-<compupgrade version="1.0">
-0" date="20051105
+1" date="20060302
-                <query>DROP TABLE IF EXISTS `#__mls_teams`</query>
-                <query>CREATE TABLE `#__mls_teams` (
@@ -25 +25 @@
-                        <query>ALTER TABLE `#__mls_teams` DROP `wwcl_id`, DROP `ngl_id`</query>
-                </version>
+                <version number="0.1.1" date="20060302">
+                        <phpfile name="upgrade_0.1.1.php" />
+                </version>
-        </upgrade>
-</compupgrade>

trunk/com_mls_teams/lang/english.php

@@ -1 +1 @@
-<?php
-/**
-0
-samuel.suter
+1
+moensch
- */
-
@@ -24 +24 @@
-                "num_display" => "Display #",
-                "search" => "Search",
+                "details" => "Details",
-                "select_team" => "Select Team",
-                "select_user" => "Select User",
@@ -65 +66 @@
-                "manage" => "Manage",
-                "join" => "Join",
-
+
+
-
-?>

trunk/com_mls_teams/lang/german.php

@@ -1 +1 @@
-<?php
-/**
-0
-samuel.suter
+1
+moensch
- */
-
@@ -23 +23 @@
-                "num_display" => "Zeige #",
-                "search" => "Suche",
+                "details" => "Details",
-                "select_team" => "Team w�en",
-                "select_user" => "User w�en",
@@ -64 +65 @@
-                "manage" => "Verwalten",
-                "join" => "Beitreten",
-
+
+
-
-?>

trunk/com_mls_teams/mls_teams.html.php

@@ -197 +197 @@
-        }
-        
-
+leaguesdata, $
-                global $my, $l;
-                $l->setBlock("teams");
@@ -261 +261 @@
-                        </tr>
-                </table>
+                <br />
+                <?php
+                foreach($leaguesdata AS $leaguename => $data) {
+                        $function = "editTeam_".$leaguename;
+                        echo "<div id=\"form_".$leaguename."\">\n";
+                        $function ($row, $data);
+                        echo "<br />\n";
+                        echo "</div>\n";
+                }
+                ?>
-                <input type="hidden" name="founded" value="<?php echo $row->founded; ?>" />
-                <input type="hidden" name="option" value="<?php echo $option; ?>" />
@@ -343 +353 @@
-                        <tr>
-                                <td style="text-align: center; color: #ABABAB;">
-Mambo
-Samuel Suter &lt;<a href="mailto:samuel.suter@gmx.ch">samuel.suter@gmx.ch
+Joomla
+- 2006 Samuel Suter &lt;<a href="mailto:samuel.suter@mylansite.org">samuel.suter@mylansite.org
-                                This is Free Software released under the GNU/GPL License.
-                                </td>

trunk/com_mls_teams/mls_teams.php

@@ -18 +18 @@
-$teamid = mosGetParam($_REQUEST,'teamid');
-$last_task = mosGetParam($_REQUEST,'last_task');
+
+//Load league frontend.php files
+$database->setQuery( "SELECT * FROM `#__mls_tournaments_leagues` WHERE `teams`='1' ORDER BY `name` ASC" );
+$leagues = $database->loadObjectList();
+foreach($leagues AS $league) {
+        require_once( $mosConfig_absolute_path."/administrator/components/com_mls_tournaments/leagues/".$league->name."/frontend.php" );
+        require_once( $mosConfig_absolute_path."/administrator/components/com_mls_tournaments/leagues/".$league->name."/classes.php" );
+}
+
-switch($task) {
-        case "list":
@@ -184 +193 @@
-        }
-        
+        //Save league data
+        $database->setQuery( "SELECT * FROM `#__mls_tournaments_leagues` WHERE `teams`='1' ORDER BY `name` ASC" );
+        $leagues = $database->loadObjectList();
+        foreach($leagues AS $league) {
+                $name = $league->name;
+                $class = "MLSTournaments_".$name."_teams";
+                $teamleague = new $class( $database );
+                $_POST[$name]["parentid"] = $row->id;
+                $teamleague->bind( $_POST[$name] );
+                $teamleague->store();
+        }
+        
-        mosRedirect( "index.php?option=$option&Itemid=$Itemid&mosmsg=".urlencode($txt) );
-}
@@ -252 +273 @@
-                $row->founded = date( "Y-m-d H:i:s", time()+$mosConfig_offset*60*60 );
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

trunk/com_mls_teams/mls_teams.xml

@@ -3 +3 @@
-        <name>mls_teams</name>
-        <package>myLANsite</package>
-5/11/2005
+2/03/2006
-        <author>Samuel Suter</author>
-
-gmx.ch
+- 2006 
+mylansite.org
-        <authorUrl>http://www.mylansite.org</authorUrl>