xoops-svn

[<be...@us...>]

Revision: 12473
          http://sourceforge.net/p/xoops/svn/12473
Author:   beckmi
Date:     2014-04-25 11:29:22 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update: Avaman

Modified Paths:
--------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/about.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_footer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_header.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/avatars.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/menu.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/smilies.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/docs/changelog.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/include/Archive_Zip.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/include/gtickets.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/english/admin.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/english/modinfo.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/xoops_version.php

Added Paths:
-----------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/assets/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/assets/images/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/assets/images/avaman_slogo.png
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/assets/images/index.html
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/assets/index.html

Removed Paths:
-------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/images/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/italian/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/japanese/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/persian/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/polish/
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/language/spanish/

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/about.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/about.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -29,4 +29,4 @@
 echo $aboutAdmin->addNavigation('about.php');
 echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
 
-include_once 'admin_footer.php';
\ No newline at end of file
+include_once 'admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_footer.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_footer.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -27,4 +27,4 @@
     ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
     ."</div>";
 
-xoops_cp_footer();
\ No newline at end of file
+xoops_cp_footer();

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_header.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/admin_header.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -39,8 +39,8 @@
 $pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))) {
         include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-    }else{
+    } else {
         redirect_header("../../../admin.php", 5, _AM_AVAMAN_MODULEADMIN_MISSING, false);
-    }
\ No newline at end of file
+    }

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/avatars.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/avatars.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/avatars.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -21,17 +21,16 @@
  */
 
 $avaman_allowed_exts = array(
-	'gif' => 'image/gif' ,
-	'jpg' => 'image/jpeg' ,
-	'jpeg' => 'image/jpeg' ,
-	'png' => 'image/png' ,
+    'gif' => 'image/gif' ,
+    'jpg' => 'image/jpeg' ,
+    'jpeg' => 'image/jpeg' ,
+    'png' => 'image/png' ,
 ) ;
 $realmyname = 'avatars.php' ;
 
+include_once '../../../include/cp_header.php' ;
 
-include_once( '../../../include/cp_header.php' ) ;
-
-include_once "../include/gtickets.php" ;
+include_once '../include/gtickets.php';
 include_once 'admin_header.php';
 $indexAdmin = new ModuleAdmin();
 
@@ -42,136 +41,124 @@
 // POST Stage
 //
 
-if( ! empty( $_POST['modify_avatars'] ) ) {
+if ( ! empty( $_POST['modify_avatars'] ) ) {
 
-	// Ticket Check
-	if ( ! $xoopsGTicket->check() ) {
-		redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
-	}
+    // Ticket Check
+    if ( ! $xoopsGTicket->check() ) {
+        redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
+    }
 
-	// rename
-	$avatar_ids = array() ;
-	if( is_array( @$_POST['avatar_names'] ) ) {
-		foreach( $_POST['avatar_names'] as $avatar_id => $avatar_name ) {
-			$avatar_id = intval( $avatar_id ) ;
-			$db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_name='".$myts->addSlashes($avatar_name)."' WHERE avatar_id=".intval($avatar_id) ) ;
-			$avatar_ids[] = $avatar_id ;
-		}
-	}
+    // rename
+    $avatar_ids = array() ;
+    if ( is_array( @$_POST['avatar_names'] ) ) {
+        foreach ($_POST['avatar_names'] as $avatar_id => $avatar_name) {
+            $avatar_id = intval( $avatar_id ) ;
+            $db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_name='".$myts->addSlashes($avatar_name)."' WHERE avatar_id=".intval($avatar_id) ) ;
+            $avatar_ids[] = $avatar_id ;
+        }
+    }
 
-	// display
-	foreach( $avatar_ids as $avatar_id ) {
-		if( empty( $_POST['avatar_displays'][$avatar_id] ) ) {
-			$db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_display=0 WHERE avatar_id=$avatar_id" ) ;
-		} else {
-			$db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_display=1 WHERE avatar_id=$avatar_id" ) ;
-		}
-	}
+    // display
+    foreach ($avatar_ids as $avatar_id) {
+        if ( empty( $_POST['avatar_displays'][$avatar_id] ) ) {
+            $db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_display=0 WHERE avatar_id=$avatar_id" ) ;
+        } else {
+            $db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_display=1 WHERE avatar_id=$avatar_id" ) ;
+        }
+    }
 
-	// weight
-	foreach( $avatar_ids as $avatar_id ) {
-		$db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_weight='".intval(@$_POST['avatar_weights'][$avatar_id])."' WHERE avatar_id=$avatar_id" ) ;
-	}
+    // weight
+    foreach ($avatar_ids as $avatar_id) {
+        $db->query( "UPDATE ".$db->prefix("avatar")." SET avatar_weight='".intval(@$_POST['avatar_weights'][$avatar_id])."' WHERE avatar_id=$avatar_id" ) ;
+    }
 
-	// delete
-	foreach( $avatar_ids as $avatar_id ) {
-		if( ! empty( $_POST['avatar_deletes'][$avatar_id] ) ) {
-			$result = $db->query( "SELECT a.avatar_file,COUNT(l.user_id) FROM ".$db->prefix("avatar")." a NATURAL LEFT JOIN ".$db->prefix("avatar_user_link")." l WHERE a.avatar_id=$avatar_id GROUP BY a.avatar_id" ) ;
-			if( $result ) {
-				list( $file , $users ) = $db->fetchRow( $result ) ;
-				if( $users > 0 ) continue ;
-				if( strstr( $file , '..' ) ) die( '.. found.' ) ;
-				@unlink( XOOPS_UPLOAD_PATH . '/' . $file ) ;
-				$db->query( "DELETE FROM ".$db->prefix("avatar")." WHERE avatar_id=$avatar_id" ) ;
-			}
-		}
-	}
+    // delete
+    foreach ($avatar_ids as $avatar_id) {
+        if ( ! empty( $_POST['avatar_deletes'][$avatar_id] ) ) {
+            $result = $db->query( "SELECT a.avatar_file,COUNT(l.user_id) FROM ".$db->prefix("avatar")." a NATURAL LEFT JOIN ".$db->prefix("avatar_user_link")." l WHERE a.avatar_id=$avatar_id GROUP BY a.avatar_id" ) ;
+            if ($result) {
+                list( $file , $users ) = $db->fetchRow( $result ) ;
+                if( $users > 0 ) continue ;
+                if( strstr( $file , '..' ) ) die( '.. found.' ) ;
+                @unlink( XOOPS_UPLOAD_PATH . '/' . $file ) ;
+                $db->query( "DELETE FROM ".$db->prefix("avatar")." WHERE avatar_id=$avatar_id" ) ;
+            }
+        }
+    }
 
-	redirect_header( $realmyname , 2 , _AM_AVAMAN_DBUPDATED ) ;
-	exit ;
+    redirect_header( $realmyname , 2 , _AM_AVAMAN_DBUPDATED ) ;
+    exit ;
 }
 
-
 // ARCHIVE UPLOAD
-if( ! empty( $_FILES['upload_archive']['tmp_name'] ) && is_uploaded_file( $_FILES['upload_archive']['tmp_name'] ) ) {
+if ( ! empty( $_FILES['upload_archive']['tmp_name'] ) && is_uploaded_file( $_FILES['upload_archive']['tmp_name'] ) ) {
 
-	// extract stage
-	$orig_filename4check = strtolower( $_FILES['upload_archive']['name'] ) ;
-	$orig_ext4check = substr( $orig_filename4check , strrpos( $orig_filename4check , '.' ) + 1 ) ;
-	if( $orig_ext4check == 'zip' ) {
-	
-		// zip
-		include_once dirname(dirname(__FILE__)).'/include/Archive_Zip.php' ;
-		$reader = new Archive_Zip( $_FILES['upload_archive']['tmp_name'] ) ;
-		$files = $reader->extract( array( 'extract_as_string' => true ) ) ;
-		if( ! is_array( @$files ) ) die( $reader->errorName() ) ;
-	
-	} else if( $orig_ext4check == 'tar' || $orig_ext4check == 'tgz' || $orig_ext4check == 'gz' ) {
-	
-		// tar or tgz or tar.gz
-		include_once XOOPS_ROOT_PATH.'/class/class.tar.php' ;
-		$tar = new tar() ;
-		$tar->openTar( $_FILES['upload_archive']['tmp_name'] ) ;
-		$files = array() ;
-		foreach( $tar->files as $id => $info ) {
-			$files[] = array(
-				'filename' => $info['name'] ,
-				'mtime' => $info['time'] ,
-				'content' => $info['file'] ,
-			) ;
-		}
-		if( empty( $files ) ) die( _AM_AVAMAN_ERR_INVALIDARCHIVE ) ;
+    // extract stage
+    $orig_filename4check = strtolower( $_FILES['upload_archive']['name'] ) ;
+    $orig_ext4check = substr( $orig_filename4check , strrpos( $orig_filename4check , '.' ) + 1 ) ;
+    if ($orig_ext4check == 'zip') {
 
-	} else if( ! empty( $avaman_allowed_exts[$orig_ext4check] ) ) {
-	
-		// a single image file
-		$files = array() ;
-		$files[] = array(
-			'filename' => $_FILES['upload_archive']['name'] ,
-			'mtime' => time() ,
-			'content' => function_exists( 'file_get_contents' ) ? file_get_contents( $_FILES['upload_archive']['tmp_name'] ) : implode( file( $_FILES['upload_archive']['tmp_name'] ) ) ,
-		) ;
-	} else {
-		die( _AM_AVAMAN_INVALIDEXT ) ;
-	}
+        // zip
+        include_once dirname(dirname(__FILE__)).'/include/Archive_Zip.php' ;
+        $reader = new Archive_Zip( $_FILES['upload_archive']['tmp_name'] ) ;
+        $files = $reader->extract( array( 'extract_as_string' => true ) ) ;
+        if( ! is_array( @$files ) ) die( $reader->errorName() ) ;
 
-	// import stage
-	$imported = 0 ;
-	foreach( $files as $file ) {
-	
-		if( ! empty( $file['folder'] ) ) continue ;
-		$file_pos = strrpos( $file['filename'] , '/' ) ;
-		$file_name = $file_pos === false ? $file['filename'] : substr( $file['filename'] , $file_pos + 1 ) ;
-		$ext_pos = strrpos( $file_name , '.' ) ;
-		if( $ext_pos === false ) continue ;
-		$ext = strtolower( substr( $file_name , $ext_pos + 1 ) ) ;
-		if( empty( $avaman_allowed_exts[$ext] ) ) continue ;
-		$file_node = substr( $file_name , 0 , $ext_pos ) ;
-		$save_file_name = uniqid( 'savt' ) . '.' . $ext ;
-		$fw = fopen( XOOPS_UPLOAD_PATH.'/'.$save_file_name , "w" ) ;
-		if( ! $fw ) continue ;
-		@fwrite( $fw , $file['content'] ) ;
-		@fclose( $fw ) ;
-		$db->query( "INSERT INTO ".$db->prefix("avatar")." SET avatar_file='".addslashes($save_file_name)."', avatar_name='".addslashes($file_node)."', avatar_mimetype='".addslashes(@$avaman_allowed_exts[$ext])."', avatar_created=UNIX_TIMESTAMP(), avatar_display=1, avatar_weight=0, avatar_type='S'" ) ;
+    } elseif ($orig_ext4check == 'tar' || $orig_ext4check == 'tgz' || $orig_ext4check == 'gz') {
 
-		$imported ++ ;
-	}
-	
-	redirect_header( $realmyname , 3 , sprintf( _AM_AVAMAN_FILEUPLOADED , $imported )  ) ;
-	exit ;
-}
+        // tar or tgz or tar.gz
+        include_once XOOPS_ROOT_PATH.'/class/class.tar.php' ;
+        $tar = new tar() ;
+        $tar->openTar( $_FILES['upload_archive']['tmp_name'] ) ;
+        $files = array() ;
+        foreach ($tar->files as $id => $info) {
+            $files[] = array(
+                'filename' => $info['name'] ,
+                'mtime' => $info['time'] ,
+                'content' => $info['file'] ,
+            ) ;
+        }
+        if( empty( $files ) ) die( _AM_AVAMAN_ERR_INVALIDARCHIVE ) ;
 
+    } elseif ( ! empty( $avaman_allowed_exts[$orig_ext4check] ) ) {
 
+        // a single image file
+        $files = array() ;
+        $files[] = array(
+            'filename' => $_FILES['upload_archive']['name'] ,
+            'mtime' => time() ,
+            'content' => function_exists( 'file_get_contents' ) ? file_get_contents( $_FILES['upload_archive']['tmp_name'] ) : implode( file( $_FILES['upload_archive']['tmp_name'] ) ) ,
+        ) ;
+    } else {
+        die( _AM_AVAMAN_INVALIDEXT ) ;
+    }
 
+    // import stage
+    $imported = 0 ;
+    foreach ($files as $file) {
 
+        if( ! empty( $file['folder'] ) ) continue ;
+        $file_pos = strrpos( $file['filename'] , '/' ) ;
+        $file_name = $file_pos === false ? $file['filename'] : substr( $file['filename'] , $file_pos + 1 ) ;
+        $ext_pos = strrpos( $file_name , '.' ) ;
+        if( $ext_pos === false ) continue ;
+        $ext = strtolower( substr( $file_name , $ext_pos + 1 ) ) ;
+        if( empty( $avaman_allowed_exts[$ext] ) ) continue ;
+        $file_node = substr( $file_name , 0 , $ext_pos ) ;
+        $save_file_name = uniqid( 'savt' ) . '.' . $ext ;
+        $fw = fopen( XOOPS_UPLOAD_PATH.'/'.$save_file_name , "w" ) ;
+        if( ! $fw ) continue ;
+        @fwrite( $fw , $file['content'] ) ;
+        @fclose( $fw ) ;
+        $db->query( "INSERT INTO ".$db->prefix("avatar")." SET avatar_file='".addslashes($save_file_name)."', avatar_name='".addslashes($file_node)."', avatar_mimetype='".addslashes(@$avaman_allowed_exts[$ext])."', avatar_created=UNIX_TIMESTAMP(), avatar_display=1, avatar_weight=0, avatar_type='S'" ) ;
 
+        $imported ++ ;
+    }
 
+    redirect_header( $realmyname , 3 , sprintf( _AM_AVAMAN_FILEUPLOADED , $imported )  ) ;
+    exit ;
+}
 
-
-
-
-
-
 // Form Stage
 
 xoops_cp_header() ;
@@ -182,39 +169,39 @@
 
 echo "
 <form action='$realmyname' id='avaman_upload' method='post' enctype='multipart/form-data' class='odd'>
-	<label for='upload_archive'>"._AM_AVAMAN_UPLOAD."</label>
-	<br />
-	<input type='file' id='upload_archive' name='upload_archive' size='60' />
-	<input type='submit' value='"._SUBMIT."' />
+    <label for='upload_archive'>"._AM_AVAMAN_UPLOAD."</label>
+    <br />
+    <input type='file' id='upload_archive' name='upload_archive' size='60' />
+    <input type='submit' value='"._SUBMIT."' />
 </form>
 <form action='$realmyname' name='avaman_list' id='avaman_list' method='post'>
 <table class='outer' id='avaman_main'>
-	<tr>
-		<th>"._AM_AVAMAN_TH_ID."</th>
-		<th>"._AM_AVAMAN_TH_FILE."</th>
-		<th>"._AM_AVAMAN_TH_AVATARNAME."</th>
-		<th>"._AM_AVAMAN_TH_CREATED."</th>
-		<th>"._AM_AVAMAN_TH_DISPLAY."</th>
-		<th>"._AM_AVAMAN_TH_WEIGHT."</th>
-		<th>"._AM_AVAMAN_TH_USERS."</th>
-		<th>"._AM_AVAMAN_TH_DELETE."<input type='checkbox' name='selectall' onclick=\"with(document.avaman_list){for(i=0;i<length;i++){if(elements[i].type=='checkbox'&&elements[i].disabled==false&&elements[i].name.indexOf('deletes')>=0){elements[i].checked=this.checked;}}}\" title='"._AM_AVAMAN_CB_SELECTALL."' /></th>
-	</tr>\n" ;
+    <tr>
+        <th>"._AM_AVAMAN_TH_ID."</th>
+        <th>"._AM_AVAMAN_TH_FILE."</th>
+        <th>"._AM_AVAMAN_TH_AVATARNAME."</th>
+        <th>"._AM_AVAMAN_TH_CREATED."</th>
+        <th>"._AM_AVAMAN_TH_DISPLAY."</th>
+        <th>"._AM_AVAMAN_TH_WEIGHT."</th>
+        <th>"._AM_AVAMAN_TH_USERS."</th>
+        <th>"._AM_AVAMAN_TH_DELETE."<input type='checkbox' name='selectall' onclick=\"with(document.avaman_list){for (i=0;i<length;i++) {if(elements[i].type=='checkbox'&&elements[i].disabled==false&&elements[i].name.indexOf('deletes')>=0) {elements[i].checked=this.checked;}}}\" title='"._AM_AVAMAN_CB_SELECTALL."' /></th>
+    </tr>\n" ;
 
-while( list( $avatar_id , $avatar_file , $avatar_name , $avatar_created , $avatar_display , $avatar_weight , $avatar_users ) = $db->fetchRow( $result ) ) {
-	$evenodd = @$evenodd == 'even' ? 'odd' : 'even' ;
-	$delete_disabled = $avatar_users > 0 ? "disabled='disabled'" : "" ;
+while ( list( $avatar_id , $avatar_file , $avatar_name , $avatar_created , $avatar_display , $avatar_weight , $avatar_users ) = $db->fetchRow( $result ) ) {
+    $evenodd = @$evenodd == 'even' ? 'odd' : 'even' ;
+    $delete_disabled = $avatar_users > 0 ? "disabled='disabled'" : "" ;
 
-	echo "
-	<tr>
-		<td class='$evenodd' align='center'>$avatar_id</td>
-		<td class='$evenodd' align='center'><img src='".XOOPS_UPLOAD_URL.'/'.urlencode($avatar_file)."' alt='' /></td>
-		<td class='$evenodd' align='center'><input type='text' size='24' name='avatar_names[$avatar_id]' value='".htmlspecialchars($avatar_name,ENT_QUOTES)."' /></td>
-		<td class='$evenodd' align='center'> ".formatTimestamp($avatar_created)."</td>
-		<td class='$evenodd' align='center'><input type='checkbox' name='avatar_displays[$avatar_id]' ".($avatar_display?"checked='checked'":"")." /></td>
-		<td class='$evenodd' align='center'><input type='text' size='4' name='avatar_weights[$avatar_id]' value='$avatar_weight' style='text-align:right;' /></td>
-		<td class='$evenodd' align='center'>".intval($avatar_users)."</td>
-		<td class='$evenodd' align='center'><input type='checkbox' name='avatar_deletes[$avatar_id]' $delete_disabled /></td>
-	</tr>\n" ;
+    echo "
+    <tr>
+        <td class='$evenodd' align='center'>$avatar_id</td>
+        <td class='$evenodd' align='center'><img src='".XOOPS_UPLOAD_URL.'/'.urlencode($avatar_file)."' alt='' /></td>
+        <td class='$evenodd' align='center'><input type='text' size='24' name='avatar_names[$avatar_id]' value='".htmlspecialchars($avatar_name,ENT_QUOTES)."' /></td>
+        <td class='$evenodd' align='center'> ".formatTimestamp($avatar_created)."</td>
+        <td class='$evenodd' align='center'><input type='checkbox' name='avatar_displays[$avatar_id]' ".($avatar_display?"checked='checked'":"")." /></td>
+        <td class='$evenodd' align='center'><input type='text' size='4' name='avatar_weights[$avatar_id]' value='$avatar_weight' style='text-align:right;' /></td>
+        <td class='$evenodd' align='center'>".intval($avatar_users)."</td>
+        <td class='$evenodd' align='center'><input type='checkbox' name='avatar_deletes[$avatar_id]' $delete_disabled /></td>
+    </tr>\n" ;
 }
 echo "
 </table>
@@ -223,4 +210,4 @@
 </form>
 " ;
 
-include "admin_footer.php";
\ No newline at end of file
+include 'admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/index.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/index.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -24,9 +24,9 @@
 include 'admin_header.php';
 xoops_cp_header();
 
-	$indexAdmin = new ModuleAdmin();
+    $indexAdmin = new ModuleAdmin();
 
     echo $indexAdmin->addNavigation('index.php');
     echo $indexAdmin->renderIndex();
 
-include "admin_footer.php";
\ No newline at end of file
+include 'admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/menu.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/menu.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -20,7 +20,6 @@
  * @version    $Id $
  */
 
-
 defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
 
 $path = dirname(dirname(dirname(dirname(__FILE__))));
@@ -33,7 +32,6 @@
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');
 $pathLanguage    = $path . $pathModuleAdmin;
 
-
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
     $fileinc = $pathLanguage . '/language/english/main.php';
 }
@@ -48,17 +46,17 @@
 $adminmenu[$i]["link"]  = 'admin/index.php';
 $adminmenu[$i]["icon"]  = $pathIcon32 . '/home.png';
 
-$i++;
+++$i;
 $adminmenu[$i]["title"] = _MI_AVAMAN_AVATARMANAGER;
 $adminmenu[$i]["link"]  = 'admin/avatars.php';
 $adminmenu[$i]["icon"]  = $pathIcon32.'/penguin.png';
 
-$i++;
+++$i;
 $adminmenu[$i]["title"] = _MI_AVAMAN_SMILIESMANAGER;
 $adminmenu[$i]["link"]  = 'admin/smilies.php';
 $adminmenu[$i]["icon"]  = $pathIcon32.'/face-smile.png';
 
-$i++;
+++$i;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 $adminmenu[$i]["link"]  = 'admin/about.php';
-$adminmenu[$i]["icon"]  = $pathIcon32 . '/about.png';
\ No newline at end of file
+$adminmenu[$i]["icon"]  = $pathIcon32 . '/about.png';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/smilies.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/smilies.php	2014-04-25 05:09:29 UTC (rev 12472)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/avaman/admin/smilies.php	2014-04-25 11:29:22 UTC (rev 12473)
@@ -21,20 +21,18 @@
  */
 
 $avaman_allowed_exts = array(
-	'gif' => 'image/gif' ,
-	'jpg' => 'image/jpeg' ,
-	'jpeg' => 'image/jpeg' ,
-	'png' => 'image/png' ,
+    'gif' => 'image/gif' ,
+    'jpg' => 'image/jpeg' ,
+    'jpeg' => 'image/jpeg' ,
+    'png' => 'image/png' ,
 ) ;
 $realmyname = 'smilies.php' ;
 
-
-include_once( '../../../include/cp_header.php' ) ;
-include_once "../include/gtickets.php" ;
+include_once '../../../include/cp_header.php' ;
+include_once '../include/gtickets.php';
 include_once 'admin_header.php';
 $indexAdmin = new ModuleAdmin();
 
-
 $db =& XoopsDatabaseFactory::getDatabaseConnection();
 $myts =& MyTextSanitizer::getInstance() ;
 
@@ -42,135 +40,123 @@
 // POST Stage
 //
 
-if( ! empty( $_POST['modify_smilies'] ) ) {
+if ( ! empty( $_POST['modify_smilies'] ) ) {
 
-	// Ticket Check
-	if ( ! $xoopsGTicket->check() ) {
-		redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
-	}
+    // Ticket Check
+    if ( ! $xoopsGTicket->check() ) {
+        redirect_header(XOOPS_URL.'/',3,$xoopsGTicket->getErrors());
+    }
 
-	// rename emotion
-	$smiles_ids = array() ;
-	if( is_array( @$_POST['emotions'] ) ) {
-		foreach( $_POST['emotions'] as $smiles_id => $emotion ) {
-			$smiles_id = intval( $smiles_id ) ;
-			$db->query( "UPDATE ".$db->prefix("smiles")." SET emotion='".$myts->addSlashes($emotion)."' WHERE id=".intval($smiles_id) ) ;
-			$smiles_ids[] = $smiles_id ;
-		}
-	}
+    // rename emotion
+    $smiles_ids = array() ;
+    if ( is_array( @$_POST['emotions'] ) ) {
+        foreach ($_POST['emotions'] as $smiles_id => $emotion) {
+            $smiles_id = intval( $smiles_id ) ;
+            $db->query( "UPDATE ".$db->prefix("smiles")." SET emotion='".$myts->addSlashes($emotion)."' WHERE id=".intval($smiles_id) ) ;
+            $smiles_ids[] = $smiles_id ;
+        }
+    }
 
-	// code
-	foreach( $smiles_ids as $smiles_id ) {
-		$db->query( "UPDATE ".$db->prefix("smiles")." SET code='".$myts->addSlashes(@$_POST['codes'][$smiles_id])."' WHERE id=$smiles_id" ) ;
-	}
+    // code
+    foreach ($smiles_ids as $smiles_id) {
+        $db->query( "UPDATE ".$db->prefix("smiles")." SET code='".$myts->addSlashes(@$_POST['codes'][$smiles_id])."' WHERE id=$smiles_id" ) ;
+    }
 
-	// display
-	foreach( $smiles_ids as $smiles_id ) {
-		if( empty( $_POST['displays'][$smiles_id] ) ) {
-			$db->query( "UPDATE ".$db->prefix("smiles")." SET display=0 WHERE id=$smiles_id" ) ;
-		} else {
-			$db->query( "UPDATE ".$db->prefix("smiles")." SET display=1 WHERE id=$smiles_id" ) ;
-		}
-	}
+    // display
+    foreach ($smiles_ids as $smiles_id) {
+        if ( empty( $_POST['displays'][$smiles_id] ) ) {
+            $db->query( "UPDATE ".$db->prefix("smiles")." SET display=0 WHERE id=$smiles_id" ) ;
+        } else {
+            $db->query( "UPDATE ".$db->prefix("smiles")." SET display=1 WHERE id=$smiles_id" ) ;
+        }
+    }
 
-	// delete
-	foreach( $smiles_ids as $smiles_id ) {
-		if( ! empty( $_POST['deletes'][$smiles_id] ) ) {
-			$result = $db->query( "SELECT smile_url FROM ".$db->prefix("smiles")." WHERE id=$smiles_id" ) ;
-			if( $result ) {
-				list( $file ) = $db->fetchRow( $result ) ;
-				if( strstr( $file , '..' ) ) die( '.. found.' ) ;
-				@unlink( XOOPS_UPLOAD_PATH . '/' . $file ) ;
-				$db->query( "DELETE FROM ".$db->prefix("smiles")." WHERE id=$smiles_id" ) ;
-			}
-		}
-	}
+    // delete
+    foreach ($smiles_ids as $smiles_id) {
+        if ( ! empty( $_POST['deletes'][$smiles_id] ) ) {
+            $result = $db->query( "SELECT smile_url FROM ".$db->prefix("smiles")." WHERE id=$smiles_id" ) ;
+            if ($result) {
+                list( $file ) = $db->fetchRow( $result ) ;
+                if( strstr( $file , '..' ) ) die( '.. found.' ) ;
+                @unlink( XOOPS_UPLOAD_PATH . '/' . $file ) ;
+                $db->query( "DELETE FROM ".$db->prefix("smiles")." WHERE id=$smiles_id" ) ;
+            }
+        }
+    }
 
-	redirect_header( $realmyname , 2 , _AM_AVAMAN_DBUPDATED ) ;
-	exit ;
+    redirect_header( $realmyname , 2 , _AM_AVAMAN_DBUPDATED ) ;
+    exit ;
 }
 
-
 // ARCHIVE UPLOAD
-if( ! empty( $_FILES['upload_archive']['tmp_name'] ) && is_uploaded_file( $_FILES['upload_archive']['tmp_name'] ) ) {
+if ( ! empty( $_FILES['upload_archive']['tmp_name'] ) && is_uploaded_file( $_FILES['upload_archive']['tmp_name'] ) ) {
 
-	// extract stage
-	$orig_filename4check = strtolower( $_FILES['upload_archive']['name'] ) ;
-	$orig_ext4check = substr( $orig_filename4check , strrpos( $orig_filename4check , '.' ) + 1 ) ;
-	if( $orig_ext4check == 'zip' ) {
-	
-		// zip
-		include_once dirname(dirname(__FILE__)).'/include/Archive_Zip.php' ;
-		$reader = new Archive_Zip( $_FILES['upload_archive']['tmp_name'] ) ;
-		$files = $reader->extract( array( 'extract_as_string' => true ) ) ;
-		if( ! is_array( @$files ) ) die( $reader->errorName() ) ;
-	
-	} else if( $orig_ext4check == 'tar' || $orig_ext4check == 'tgz' || $orig_ext4check == 'gz' ) {
-	
-		// tar or tgz or tar.gz
-		include_once XOOPS_ROOT_PATH.'/class/class.tar.php' ;
-		$tar = new tar() ;
-		$tar->openTar( $_FILES['upload_archive']['tmp_name'] ) ;
-		$files = array() ;
-		foreach( $tar->files as $id => $info ) {
-			$files[] = array(
-				'filename' => $info['name'] ,
-				'mtime' => $info['time'] ,
-				'content' => $info['file'] ,
-			) ;
-		}
-		if( empty( $files ) ) die( _AM_AVAMAN_ERR_INVALIDARCHIVE ) ;
+    // extract stage
+    $orig_filename4check = strtolower( $_FILES['upload_archive']['name'] ) ;
+    $orig_ext4check = substr( $orig_filename4check , strrpos( $orig_filename4check , '.' ) + 1 ) ;
+    if ($orig_ext4check == 'zip') {
 
-	} else if( ! empty( $avaman_allowed_exts[$orig_ext4check] ) ) {
-	
-		// a single image file
-		$files = array() ;
-		$files[] = array(
-			'filename' => $_FILES['upload_archive']['name'] ,
-			'mtime' => time() ,
-			'content' => function_exists( 'file_get_contents' ) ? file_get_contents( $_FILES['upload_archive']['tmp_name'] ) : implode( file( $_FILES['upload_archive']['tmp_name'] ) ) ,
-		) ;
-	} else {
-		die( _AM_AVAMAN_INVALIDEXT ) ;
-	}
+        // zip
+        include_once dirname(dirname(__FILE__)).'/include/Archive_Zip.php' ;
+        $reader = new Archive_Zip( $_FILES['upload_archive']['tmp_name'] ) ;
+        $files = $reader->extract( array( 'extract_as_string' => true ) ) ;
+        if( ! is_array( @$files ) ) die( $reader->errorName() ) ;
 
-	// import stage
-	$imported = 0 ;
-	foreach( $files as $file ) {
-	
-		if( ! empty( $file['folder'] ) ) continue ;
-		$file_pos = strrpos( $file['filename'] , '/' ) ;
-		$file_name = $file_pos === false ? $file['filename'] : substr( $file['filename'] , $file_pos + 1 ) ;
-		$ext_pos = strrpos( $file_name , '.' ) ;
-		if( $ext_pos === false ) continue ;
-		$ext = strtolower( substr( $file_name , $ext_pos + 1 ) ) ;
-		if( empty( $avaman_allowed_exts[$ext] ) ) continue ;
-		$file_node = substr( $file_name , 0 , $ext_pos ) ;
-		$save_file_name = uniqid( 'smil' ) . '.' . $ext ;
-		$fw = fopen( XOOPS_UPLOAD_PATH.'/'.$save_file_name , "w" ) ;
-		if( ! $fw ) continue ;
-		@fwrite( $fw , $file['content'] ) ;
-		@fclose( $fw ) ;
-		$db->query( "INSERT INTO ".$db->prefix("smiles")." SET smile_url='".addslashes($save_file_name)."', code='".addslashes(rawurldecode($file_node))."', display=0, emotion=''" ) ;
+    } elseif ($orig_ext4check == 'tar' || $orig_ext4check == 'tgz' || $orig_ext4check == 'gz') {
 
-		$imported ++ ;
-	}
-	
-	redirect_header( $realmyname , 3 , sprintf( _AM_AVAMAN_FILEUPLOADED , $imported )  ) ;
-	exit ;
-}
+        // tar or tgz or tar.gz
+        include_once XOOPS_ROOT_PATH.'/class/class.t...
 
[truncated message content]