Changeset 62

Timestamp:

10/23/06 12:37:17 (2 years ago)

Author:

moensch

Message:

Importing com_mls_seatmap 0.0.2 into trunk

Files:

• trunk/com_mls_seatmap/admin.mls_seatmap.html.php (modified) (15 diffs)
• trunk/com_mls_seatmap/admin.mls_seatmap.php (modified) (6 diffs)
• trunk/com_mls_seatmap/install.mls_seatmap.php (modified) (1 diff)
• trunk/com_mls_seatmap/lang/dutch.php (modified) (1 diff)
• trunk/com_mls_seatmap/lang/english.php (modified) (2 diffs)
• trunk/com_mls_seatmap/lang/german.php (modified) (2 diffs)
• trunk/com_mls_seatmap/mls_seatmap.class.php (modified) (1 diff)
• trunk/com_mls_seatmap/mls_seatmap.html.php (modified) (3 diffs)
• trunk/com_mls_seatmap/mls_seatmap.js (modified) (3 diffs)
• trunk/com_mls_seatmap/mls_seatmap.php (modified) (3 diffs)
• trunk/com_mls_seatmap/mls_seatmap.xml (modified) (3 diffs)
• trunk/com_mls_seatmap/version (modified) (1 diff)
• trunk/com_mls_seatmap/versions.php (added)

trunk/com_mls_seatmap/admin.mls_seatmap.html.php

@@ -288 +288 @@
-        /** ELEMENTS */
-        function listElements(&$rows, &$pageNav, $search, $category_select, $option, $act) {
-
+, $mosConfig_live_site
-                $l->setBlock("elements");
+                $imgbase = $mosConfig_live_site."/components/com_mls_seatmap/images/";
-                ?>
-                <form action="index2.php" method="post" name="adminForm">
@@ -306 +307 @@
-                <tr>
-                        <th width="20" align="center">#</th>
+                        <th width="20" align="center">&nbsp;</th>
-                        <th nowrap="nowrap" width="20"><input type="checkbox" name="toggle" value="" onclick="checkAll(<?php echo count($rows); ?>);" /></th>
-                        <th class="title"><?=$l->m("name");?></th>
@@ -327 +329 @@
-                                        <input type="checkbox" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $row->id; ?>" onclick="isChecked(this.checked);" />
-                                </td>
+                                <td width="20" align="center"><img src="<?=$imgbase;?><?=$row->id;?>_0.png"  /></td>
-                                <td><a href="#edit" onclick="return listItemTask('cb<?php echo $i;?>','edit')"><?php echo $row->name; ?></a></td>
-                                <td><?php echo $row->categoryname; ?></td>
@@ -346 +349 @@
-                ?>
-                <tr> 
-8
-
-
-8
+9
+
+
+9
-                </tr>
-                </table>
@@ -362 +365 @@
-        
-        function editElement(&$row, $lists, $option, $act) {
-
+, $mosConfig_live_site
-                $l->setBlock("elements");
-
-
+
+
+
-                <table cellpadding="4" cellspacing="0" border="0" width="100%">
-                        <tr> 
@@ -374 +378 @@
-                        <tr> 
-                                <td width="20%" align="right"><?=$l->m("name") ?>:</td>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        </tr>
-                </table>
@@ -424 +451 @@
-                <table width="100%" border="0" class="adminform">
-                        <tr>
-3
+4
-                                <table border="0" cellspacing="1" cellpadding="0">
-                                        <tr>
@@ -456 +483 @@
-                                </td>
-                        </tr>
+                        
+                        
+                        <tr>
+                                <td width="50%" valign="top">
+                                        <?php HTML_MLS_seatmap::editMap_showElementCategories($imgbase); ?>
+                                </td>
+                        </tr>
+                        <tr>
+                                <td width="50%" valign="top" height="120">
+                                        <?php HTML_MLS_seatmap::editMap_nameForm(); ?>
+                                </td>
+                        </tr>
-                        <tr>
-                                <td width="50%" valign="top" height="120">
-                                        <?php HTML_MLS_seatmap::editMap_ipForm(); ?>
-                                </td>
-                        </tr>
-                        
-                        <tr>
-                                <td width="50%" valign="top">
-                                        <?php HTML_MLS_seatmap::editMap_showElementCategories($imgbase); ?>
-                                </td>
-                        </tr>
@@ -481 +514 @@
-                global $database, $l, $mosConfig_live_site;
-                $l->setBlock("rooms");
-"../components/".$option."
+$mosConfig_live_site."/components/com_mls_seatmap
-                $database->setQuery( "SELECT * FROM `#__mls_seatmap_elements_categories` ORDER BY `name`" );
-                $rows = $database->loadObjectList();
@@ -511 +544 @@
-        
-        function editMap_listElements($categoryid, $cols = 2, $imgbase = '') {
-
-"../images/stories/seatmap
+, $mosConfig_live_site
+$mosConfig_live_site."/components/com_mls_seatmap/images
-                $database->setQuery( "SELECT *"
-                                                ."\n FROM `#__mls_seatmap_elements` AS `e`"
@@ -577 +610 @@
-                                <td align="center" valign="middle"><?=$l->m("ipblock"); ?></td>
-                                <td width="10"><input type="radio" name="action" value="ipblock" OnClick="setAction('ipblock');" /></td>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        function editMap_ipForm() {
-                global $l;
@@ -668 +751 @@
-                        <th class="title" width="120"><?=$l->m("event");?></th>
-                        <th class="title" width="120"><?=$l->m("room");?></th>
+                        <th width="20"><?=$l->m("name");?></th>
-                        <th width="20"><?=$l->m("row");?></th>
-                        <th width="20"><?=$l->m("col");?></th>
@@ -703 +787 @@
-                                <td><?php echo $row->eventname; ?></td>
-                                <td><a href="#edit" onclick="return listItemTask('cb<?php echo $i;?>','edit')"><?php echo $row->roomname; ?></a></td>
+                                <td align="center"><?php echo $row->name; ?></td>
-                                <td align="center"><?php echo $row->row; ?></td>
-                                <td align="center"><?php echo $row->col; ?></td>
@@ -716 +801 @@
-                ?>
-                <tr> 
-1
-
-
-1
+2
+
+
+2
-                </tr>
-                </table>
@@ -745 +830 @@
-                                <td width="20%" align="right"><?=$l->m("room") ?>:</td>
-                                <td width="20%"><?php echo $lists["roomid"]; ?></td>
+                        </tr>
+                        <tr> 
+                                <td width="20%" align="right"><?=$l->m("name") ?>:</td>
+                                <td width="20%"><input class="inputbox" type="text" name="name" size="10" maxlength="10" value="<?php echo $row->name; ?>" /></td>
-                        </tr>
-                        <tr> 

trunk/com_mls_seatmap/admin.mls_seatmap.php

@@ -19 +19 @@
-}
-
+if(file_exists($mosConfig_absolute_path."/administrator/components/".$option."/version")) {
+        $act = update;
+}
+
-switch($act) {
+        case "update":
+                include($mosConfig_absolute_path."/administrator/components/".$option."/install.".substr($option,4).".php");
+                update();
+                break;
-        case "rooms":
-                switch($task) {
@@ -49 +57 @@
-                                saveMap( $option, $act, false );
-                                saveMapIP( $option, $act );
+                                break;
+                        case "save_names":
+                                saveMap( $option, $act, false );
+                                saveMapNames( $option, $act );
-                                break;
-                        default:
@@ -413 +425 @@
-        }
-}
+
+//names
+function saveMapNames($option, $act) {
+        global $database, $l;
+        $l->setBlock("general");
+        
+        //first, define max row and max col
+        if($_POST["NAME_FromFirstRow"] >= $_POST["NAME_FromSecondRow"]) {
+                $row_max = $_POST["NAME_FromFirstRow"];
+                $row_min = $_POST["NAME_FromSecondRow"];
+        } else {
+                $row_max = $_POST["NAME_FromSecondRow"];
+                $row_min = $_POST["NAME_FromFirstRow"];
+        }
+        
+        if($_POST["NAME_FromFirstCol"] >= $_POST["NAME_FromSecondCol"]) {
+                $col_max = $_POST["NAME_FromFirstCol"];
+                $col_min = $_POST["NAME_FromSecondCol"];
+        } else {
+                $col_max = $_POST["NAME_FromSecondCol"];
+                $col_min = $_POST["NAME_FromFirstCol"];
+        }
+        
+        $table = $tbl_prefix . "seat_room_elements";
+        $num = $_POST["NAME_start_number"];
+        $names = array();
+        $queries = array();
+        if($_POST["NAME_direction"] == 'h') {
+                //increment normal row by row
+                for($row_count = $row_min; $row_count <= $row_max; $row_count++) {
+                        for($col_count = $col_min; $col_count <= $col_max; $col_count++) {
+                                $name = $_POST["NAME_prefix"] . $num . $_POST["NAME_suffix"];
+                                $names[] = $name;
+                                $queries[] = "UPDATE `#__mls_seatmap_room_elements` SET `name`='".$name."' WHERE `row`='$row_count' AND `col`='$col_count' AND `roomid`='".$_POST["roomid"]."'";
+                                $num++;
+                        }
+                }
+        } elseif($_POST["NAME_direction"] == 'v') {
+                for($col_count = $col_min; $col_count <= $col_max; $col_count++) {
+                        for($row_count = $row_min; $row_count <= $row_max; $row_count++) {
+                                $name = $_POST["NAME_prefix"] . $num . $_POST["NAME_suffix"];
+                                $names[] = $name;
+                                $queries[] = "UPDATE `#__mls_seatmap_room_elements` SET `name`='".$name."' WHERE `row`='$row_count' AND `col`='$col_count' AND `roomid`='".$_POST["roomid"]."'";
+                                $num++;
+                        }
+                }
+        }
+        
+        $database->setQuery( "SELECT `name` FROM `#__mls_seatmap_room_elements` WHERE `name` IN (".implode(",",$names).") ORDER BY `name` ASC" );
+        $database->query();
+        $num = $database->getNumRows();
+        if($num > 0) {
+                $message = $num . " " . $l->m("err_of_the") . " " . count($names) . " " . $l->m("err_names_defined_somewhere_else");
+                
+                mosRedirect( "index2.php?option=$option&act=$act&mosmsg=".urlencode($message) );
+        } else {
+                foreach($queries as $query) {
+                        $database->setQuery( $query );
+                        $database->query();
+                }
+                mosRedirect( "index2.php?option=$option&act=$act" );
+        }
+}
+
-function generalChange($cid, $type, $field, $value, $option, $act) {
-        global $database;
@@ -693 +769 @@
-
-function saveMLS_seatmap_elements($option,$act) {
-
-
+, $mosConfig_absolute_path
+$imgbase = $mosConfig_absolute_path."/components/com_mls_seatmap/images/";
-        $row = new mosMLS_seatmap_element( $database );
-        if (!$row->bind( $_POST )) {
@@ -709 +785 @@
-        }
-        
+        if(strlen($_FILES["upload_image"]["tmp_name"]) > 0) {
+                $file = $_FILES["upload_image"];
+                if(eregi('jpeg',$file["type"])) {
+                        $im = imagecreatefromjpeg($file["tmp_name"]);
+                        if($im) {
+                                $new_im = imagecreatetruecolor(13,13);
+                        }
+                } elseif(eregi('png',$file["type"])) {
+                        $im = imagecreatefrompng($file["tmp_name"]);
+                        if($im) {
+                                $new_im = imagecreatetruecolor(13,13);
+                        }
+                }
+                if($new_im) {
+                        imagecopy($new_im,$im,0,0,0,0,13,13);
+                        imagepng(ImageRotateRightAngle($new_im,0),$imgbase.$row->id."_0.png");
+                        imagepng(ImageRotateRightAngle($new_im,90),$imgbase.$row->id."_90.png");
+                        imagepng(ImageRotateRightAngle($new_im,180),$imgbase.$row->id."_180.png");
+                        imagepng(ImageRotateRightAngle($new_im,270),$imgbase.$row->id."_270.png");
+                }
+        }
-        mosRedirect( "index2.php?option=$option&act=$act" );
-};
-
+/**
+* Rotate an image in multiples of 90 to avoid imagerotate()
+* @author Borszczuk on http://php.net/imagerotate
+*/
+function ImageRotateRightAngle( $imgSrc, $angle ) {
+        // ensuring we got really RightAngle (if not we choose the closest one)
+        $angle = min( ( (int)(($angle+45) / 90) * 90), 270 );
+        
+        // no need to fight
+        if( $angle == 0 )
+                return( $imgSrc );
+
+        // dimenstion of source image
+        $srcX = imagesx( $imgSrc );
+        $srcY = imagesy( $imgSrc );
+        
+        switch( $angle ) {
+                case 90:
+                        $imgDest = imagecreatetruecolor( $srcY, $srcX );
+                                for( $x=0; $x<$srcX; $x++ )
+                                        for( $y=0; $y<$srcY; $y++ )
+                                                imagecopy($imgDest, $imgSrc, $srcY-$y-1, $x, $x, $y, 1, 1);
+                        break;
+                
+                case 180:
+                        $imgDest = ImageFlip( $imgSrc, IMAGE_FLIP_BOTH );
+                        break;
+                
+                case 270:
+                        $imgDest = imagecreatetruecolor( $srcY, $srcX );
+                        for( $x=0; $x<$srcX; $x++ )
+                                for( $y=0; $y<$srcY; $y++ )
+                                        imagecopy($imgDest, $imgSrc, $y, $srcX-$x-1, $x, $y, 1, 1);
+                        break;
+        }
+        return( $imgDest );
+}
+
+define("IMAGE_FLIP_HORIZONTAL",    1);
+define("IMAGE_FLIP_VERTICAL",    2);
+define("IMAGE_FLIP_BOTH",    3);
+
+/**
+* Flip an image to avoid imagerotate()
+* @author Borszczuk on http://php.net/imagecopy
+*/
+function ImageFlip($imgsrc, $type) {
+        $width = imagesx($imgsrc);
+        $height = imagesy($imgsrc);
+        
+        $imgdest = imagecreatetruecolor($width, $height);
+
+        switch( $type ) {
+                // mirror wzgl. osi
+                case IMAGE_FLIP_HORIZONTAL:
+                for( $y=0 ; $y<$height ; $y++ )
+                        imagecopy($imgdest, $imgsrc, 0, $height-$y-1, 0, $y, $width, 1);
+                break;
+        
+        case IMAGE_FLIP_VERTICAL:
+                for( $x=0 ; $x<$width ; $x++ )
+                        imagecopy($imgdest, $imgsrc, $width-$x-1, 0, $x, 0, 1, $height);
+                break;
+        
+        case IMAGE_FLIP_BOTH:
+                for( $x=0 ; $x<$width ; $x++ )
+                        imagecopy($imgdest, $imgsrc, $width-$x-1, 0, $x, 0, 1, $height);
+                        
+                        $rowBuffer = imagecreatetruecolor($width, 1);
+                        for( $y=0 ; $y<($height/2) ; $y++ ) {
+                                imagecopy($rowBuffer, $imgdest  , 0, 0, 0, $height-$y-1, $width, 1);
+                                imagecopy($imgdest  , $imgdest  , 0, $height-$y-1, 0, $y, $width, 1);
+                                imagecopy($imgdest  , $rowBuffer, 0, $y, 0, 0, $width, 1);
+                        }
+                        imagedestroy( $rowBuffer );
+                break;
+        }
+        return( $imgdest );
+}
+
+
-function removeMLS_seatmap_elements($cid,$option,$act) {
-
+
+
-        
-        if (count( $cid )) {
@@ -724 +903 @@
-                if (!$database->query()) {
-                        echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
+                }
+                foreach($cid as $id) {
+                        @unlink($imgbase."/".$id."_0.png");
+                        @unlink($imgbase."/".$id."_90.png");
+                        @unlink($imgbase."/".$id."_180.png");
+                        @unlink($imgbase."/".$id."_270.png");
-                }
-        }

trunk/com_mls_seatmap/install.mls_seatmap.php

@@ -18 +18 @@
-        $dep = array("com_mls_lang","com_mls_events");
-        check_dependencies($dep);
+};
+
+function update() {
+        global $option, $database, $mosConfig_absolute_path;
+        
+        //get versions array
+        $file = $mosConfig_absolute_path."/administrator/components/".$option."/versions.php";
+        if(file_exists($file)) {
+                include($file);
+        }
+        
+        $old_ver = file_get_contents($mosConfig_absolute_path."/administrator/components/".$option."/curr_version");
+        $new_ver = file_get_contents($mosConfig_absolute_path."/administrator/components/".$option."/version");
+        
+        //get array keys
+        $old_key = array_search($old_ver,$versions);
+        $next_version = $old_key + 1;
+        $new_key = array_search($new_ver,$versions);
+        
+        if($new_key > $old_key) {
+                //we have a new version installed, perform update
+                updateSoftware($versions[$next_version],$versions[$new_key],$versions[$old_key]);
+        }
+        
+        //now, rename the version file
+        $src = $mosConfig_absolute_path."/administrator/components/com_mls_seatmap/version";
+        $dst = $mosConfig_absolute_path."/administrator/components/com_mls_seatmap/curr_version";
+        @rename($src,$dst);
+};
+
+function updateSoftware($new_version,$final_version,$old_version) {
+        echo "<h3>Performing update from <b>'".$old_version."'</b> to <b>".$new_version."'</b></h3>\n";
+        global $versions;
+        performUpdate($new_version);
+        ?>
+        <span style="font-weight: bold; color: #00FF00">Complete!</span>
+        <hr>
+        <?php
+        if($new_version != $final_version AND $final_version != "") {
+                $old_key = array_search($new_version,$versions);
+                $next_version = $old_key + 1;
+                updateSoftware($versions[$next_version],$final_version,$versions[$old_key]);
+        }
+};
+
+function performUpdate($v) {
+        switch($v) {
+                case "0.0.2":
+                        update_002();
+                break;
+        }
+};
+
+function update_002() {
+        global $database, $mosConfig_absolute_path;
+        $database->setQuery( "ALTER TABLE `#__mls_seatmap_room_elements` ADD `name` VARCHAR( 10 ) NOT NULL AFTER `col`" );
+        $database->query();
-};
-

trunk/com_mls_seatmap/lang/dutch.php

@@ -1 +1 @@
-<?php
-/**
-English language file for myLANsite Teams
-Samuel Suter <samuel.suter@gmx.ch
+dutch language file for com_mls_seatmap 0.0.2
+Mathy Vanvoorden <matje@lanzone.be
- */
-
-defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
-
-/**
- * First, define the blocks
- **/
-$lang_data = array(
-                        "general",
-                        "events",
-                        "participants",
-                        "comments",
-                        "reviews",
-                        "seats");
-
-$lang_data["general"] = array(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-$lang_data["rooms"] = array(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-