From: <be...@us...> - 2012-04-02 22:19:32
|
Revision: 9240 http://xoops.svn.sourceforge.net/xoops/?rev=9240&view=rev Author: beckmi Date: 2012-04-02 22:19:24 +0000 (Mon, 02 Apr 2012) Log Message: ----------- Version 0.22 RC2 - XOOPS 2.5.x Admin GUI Modified Paths: -------------- XoopsModules/avaman/trunk/avaman/admin/about.php XoopsModules/avaman/trunk/avaman/admin/admin_footer.php XoopsModules/avaman/trunk/avaman/admin/admin_header.php XoopsModules/avaman/trunk/avaman/admin/menu.php XoopsModules/avaman/trunk/avaman/docs/install.txt XoopsModules/avaman/trunk/avaman/docs/lang_diff.txt XoopsModules/avaman/trunk/avaman/language/english/admin.php XoopsModules/avaman/trunk/avaman/language/english/modinfo.php XoopsModules/avaman/trunk/avaman/language/italian/admin.php XoopsModules/avaman/trunk/avaman/language/italian/modinfo.php XoopsModules/avaman/trunk/avaman/language/japanese/admin.php XoopsModules/avaman/trunk/avaman/language/japanese/modinfo.php XoopsModules/avaman/trunk/avaman/language/persian/admin.php XoopsModules/avaman/trunk/avaman/language/persian/modinfo.php XoopsModules/avaman/trunk/avaman/language/polish/admin.php XoopsModules/avaman/trunk/avaman/language/polish/modinfo.php XoopsModules/avaman/trunk/avaman/language/spanish/admin.php XoopsModules/avaman/trunk/avaman/language/spanish/modinfo.php XoopsModules/avaman/trunk/avaman/xoops_version.php Modified: XoopsModules/avaman/trunk/avaman/admin/about.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/about.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/admin/about.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -20,8 +20,8 @@ * @version $Id $ */ -include_once dirname(__FILE__) . '/admin_header.php'; - +//include_once dirname(__FILE__) . '/admin_header.php'; +include 'admin_header.php'; xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); @@ -29,4 +29,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; \ No newline at end of file +include_once 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/admin/admin_footer.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/admin_footer.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/admin/admin_footer.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -24,7 +24,7 @@ ." <div style='text-align: center;'>\n" ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" ." </div>\n" - ." " . _AM_ADMIN_FOOTER . "\n" + ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" ."</div>"; xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/admin/admin_header.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/admin_header.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/admin/admin_header.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -33,6 +33,7 @@ xoops_loadLanguage('admin', $thisModuleDir); xoops_loadLanguage('modinfo', $thisModuleDir); xoops_loadLanguage('main', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); $pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); $pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); @@ -41,5 +42,5 @@ if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); }else{ - redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); + redirect_header("../../../admin.php", 5, _AM_AVAMAN_MODULEADMIN_MISSING, false); } \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/admin/menu.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/menu.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/admin/menu.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -9,7 +9,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -/** +/* * Avaman module * * @copyright The XOOPS Project (http://www.xoops.org) @@ -20,53 +20,45 @@ * @version $Id $ */ -/** -$adminmenu = array( - array( - 'title' => _MI_AVAMAN_HOME , - 'link' => 'admin/index.php' , - ) , - array( - 'title' => _MI_AVAMAN_AVATARMANAGER , - 'link' => 'admin/avatars.php' , - ) , - array( - 'title' => _MI_AVAMAN_SMILIESMANAGER , - 'link' => 'admin/smilies.php' , - ) , -) ; -*/ defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); -$dirname = basename(dirname(dirname(__FILE__))); -$module_handler = xoops_gethandler('module'); -$module = $module_handler->getByDirname($dirname); -$pathIcon32 = $module->getInfo('icons32'); +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; -xoops_loadLanguage('admin', $dirname); +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); +$pathModuleAdmin = $module->getInfo('dirmoduleadmin'); +$pathLanguage = $path . $pathModuleAdmin; + +if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { + $fileinc = $pathLanguage . '/language/english/main.php'; +} + +include_once $fileinc; + $adminmenu = array(); -$i = 1; -$adminmenu[$i]["title"] = _MI_AVAMAN_HOME; -$adminmenu[$i]["link"] = 'admin/index.php'; -$adminmenu[$i]["icon"] = $pathIcon32.'/home.png'; +$i= 1; +$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME; +$adminmenu[$i]["link"] = 'admin/index.php'; +$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png'; + $i++; $adminmenu[$i]["title"] = _MI_AVAMAN_AVATARMANAGER; -$adminmenu[$i]["link"] = 'admin/avatars.php'; -$adminmenu[$i]["icon"] = $pathIcon32.'/penguin.png'; +$adminmenu[$i]["link"] = 'admin/avatars.php'; +$adminmenu[$i]["icon"] = $pathIcon32.'/penguin.png'; $i++; $adminmenu[$i]["title"] = _MI_AVAMAN_SMILIESMANAGER; -$adminmenu[$i]["link"] = 'admin/smilies.php'; -$adminmenu[$i]["icon"] = $pathIcon32.'/face-smile.png'; +$adminmenu[$i]["link"] = 'admin/smilies.php'; +$adminmenu[$i]["icon"] = $pathIcon32.'/face-smile.png'; $i++; -$adminmenu[$i]["title"] = _MI_AVAMAN_ADMIN_ABOUT; -$adminmenu[$i]["link"] = 'admin/about.php'; -$adminmenu[$i]["icon"] = $pathIcon32.'/about.png'; - - -?> \ No newline at end of file +$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT; +$adminmenu[$i]["link"] = 'admin/about.php'; +$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png'; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/docs/install.txt =================================================================== --- XoopsModules/avaman/trunk/avaman/docs/install.txt 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/docs/install.txt 2012-04-02 22:19:24 UTC (rev 9240) @@ -1,6 +1,6 @@ INSTALL/UNISTALL ================= -No special measures necessary, follow the standard installation process \x96 extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. +No special measures necessary, follow the standard installation process and extract the module folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. Detailed instructions on installing modules are available in the XOOPS Operations Manual: http://goo.gl/adT2i \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/docs/lang_diff.txt =================================================================== --- XoopsModules/avaman/trunk/avaman/docs/lang_diff.txt 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/docs/lang_diff.txt 2012-04-02 22:19:24 UTC (rev 9240) @@ -3,11 +3,6 @@ Below are language differences from a version to next version. -in file /language/english/modinfo.php: - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; - in file /language/english/admin.php: -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); Modified: XoopsModules/avaman/trunk/avaman/language/english/admin.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/english/admin.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/english/admin.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -40,5 +40,5 @@ define('_AM_AVAMAN_TH_EMOTION' , 'Emotion' ) ; define('_AM_AVAMAN_TH_SMILEDISPLAY' , 'Show under textarea' ) ; -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/english/modinfo.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/english/modinfo.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/english/modinfo.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -24,10 +24,4 @@ define( '_MI_AVAMAN_MODULEDESC' , 'Managing system avatars and smilies' ) ; define( '_MI_AVAMAN_AVATARMANAGER' , 'Avatar Manager' ) ; -define( '_MI_AVAMAN_SMILIESMANAGER' , 'Smilies Manager' ) ; - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; - - -?> \ No newline at end of file +define( '_MI_AVAMAN_SMILIESMANAGER' , 'Smilies Manager' ) ; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/italian/admin.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/italian/admin.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/italian/admin.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -4,8 +4,8 @@ define( "_AM_AVAMAN_DBUPDATED" , "Aggiornato correttamente" ) ; define( "_AM_AVAMAN_FILEUPLOADED" , "%s file sono stati registrati correttamente" ) ; -define( "_AM_AVAMAN_UPLOAD" , "Invia immagini (E' anche possibile inviare pi\xF9 file contemporaneamente contenuti in un archivio zip o tar.gz)" ) ; -define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "Archivio non valido. L'archivio non pu\xF2 essere aperto" ) ; +define( "_AM_AVAMAN_UPLOAD" , "Invia immagini (E' anche possibile inviare pi� file contemporaneamente contenuti in un archivio zip o tar.gz)" ) ; +define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "Archivio non valido. L'archivio non pu� essere aperto" ) ; define( "_AM_AVAMAN_INVALIDEXT" , "Tipo file non valido" ) ; define( "_AM_AVAMAN_TH_ID" , "id" ) ; @@ -21,6 +21,5 @@ define( "_AM_AVAMAN_TH_CODE" , "codice" ) ; define( "_AM_AVAMAN_TH_EMOTION" , "emozione" ) ; define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "Mostra sotto la textarea" ) ; - -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/italian/modinfo.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/italian/modinfo.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/italian/modinfo.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -6,7 +6,4 @@ define( '_MI_AVAMAN_MODULEDESC' , 'Sistema di gestione avatar semplificata' ) ; define( '_MI_AVAMAN_AVATARMANAGER' , 'Gestione Avatar' ) ; -define( '_MI_AVAMAN_SMILIESMANAGER' , 'Gestione Smilies' ) ; - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; \ No newline at end of file +define( '_MI_AVAMAN_SMILIESMANAGER' , 'Gestione Smilies' ) ; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/japanese/admin.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/japanese/admin.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/japanese/admin.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -1,24 +1,24 @@ <?php -define( "_AM_AVAMAN_DBUPDATED" , "\xB9\xB9\xBF\xB7\xA4\xB7\xA4ޤ\xB7\xA4\xBF" ) ; -define( "_AM_AVAMAN_FILEUPLOADED" , "%s \xB8ĤΥե\xA1\xA5\xA4\xA5\xEB\xA4\xF2\xC5\xD0Ͽ\xA4\xB7\xA4ޤ\xB7\xA4\xBF" ) ; -define( "_AM_AVAMAN_UPLOAD" , "\xB2\xE8\xC1\xFC\xA5ե\xA1\xA5\xA4\xA5\xEB\xA4åץ\x{D87C}\xA5\xC9(\xA5\xA2\xA1\xBC\xA5\xAB\xA5\xA4\xA5֤ξ\xEC\xB9\xE7\xA4ϡ\xA2zip\xA4ޤ\xBF\xA4\xCFtar.gz\xB7\xC1\xBC\xB0)" ) ; -define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "\xA4\xB3\xA4Υ\xA2\xA1\xBC\xA5\xAB\xA5\xA4\xA5֤ϲ\xF2\xC5\xE0\xA4Ǥ\xAD\xA4ޤ\xBB\xA4\xF3" ) ; -define( "_AM_AVAMAN_INVALIDEXT" , "\xA4\xB3\xA4Υե\xA1\xA5\xA4\xA5\xEB\xA4ϰ\xB7\xA4\xA8\xA4ޤ\xBB\xA4\xF3" ) ; +define( "_AM_AVAMAN_DBUPDATED" , "�������ޤ���" ) ; +define( "_AM_AVAMAN_FILEUPLOADED" , "%s �ĤΥե��������Ͽ���ޤ���" ) ; +define( "_AM_AVAMAN_UPLOAD" , "����ե�����åץ?��(���������֤ξ��ϡ�zip�ޤ���tar.gz����)" ) ; +define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "���Υ��������֤ϲ���Ǥ��ޤ���" ) ; +define( "_AM_AVAMAN_INVALIDEXT" , "���Υե�����ϰ����ޤ���" ) ; define( "_AM_AVAMAN_TH_ID" , "ID" ) ; -define( "_AM_AVAMAN_TH_FILE" , "\xA5ե\xA1\xA5\xA4\xA5\xEB" ) ; -define( "_AM_AVAMAN_TH_AVATARNAME" , "\xA5\xA2\xA5Х\xBF\xA1\xBC̾" ) ; -define( "_AM_AVAMAN_TH_CREATED" , "\xBA\xEE\xC0\xAE\xC6\xFC\xBB\xFE" ) ; -define( "_AM_AVAMAN_TH_DISPLAY" , "ɽ\xBC\xA8" ) ; -define( "_AM_AVAMAN_TH_WEIGHT" , "\xCA¤ӽ\xE7" ) ; -define( "_AM_AVAMAN_TH_USERS" , "\xCD\xF8\xCDѼԿ\xF4" ) ; -define( "_AM_AVAMAN_TH_DELETE" , "\xBA\xEF\xBD\xFC" ) ; -define( "_AM_AVAMAN_CB_SELECTALL" , "\xC1\xB4\xC1\xAA\xC2\xF2/\xC1\xB4\xB2\xF2\xBD\xFC" ) ; +define( "_AM_AVAMAN_TH_FILE" , "�ե�����" ) ; +define( "_AM_AVAMAN_TH_AVATARNAME" , "���Х���̾" ) ; +define( "_AM_AVAMAN_TH_CREATED" , "�������" ) ; +define( "_AM_AVAMAN_TH_DISPLAY" , "ɽ��" ) ; +define( "_AM_AVAMAN_TH_WEIGHT" , "�¤ӽ�" ) ; +define( "_AM_AVAMAN_TH_USERS" , "���ѼԿ�" ) ; +define( "_AM_AVAMAN_TH_DELETE" , "���" ) ; +define( "_AM_AVAMAN_CB_SELECTALL" , "������/�����" ) ; -define( "_AM_AVAMAN_TH_CODE" , "ɽ\xBC\xA8\xA5\xB3\xA1\xBC\xA5\xC9" ) ; -define( "_AM_AVAMAN_TH_EMOTION" , "\xB0\xD5̣" ) ; -define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "\xA5ƥ\xAD\xA5\xB9\xA5ȥ\xA8\xA5ꥢľ\xB2\xBC\xA4\xCEɽ\xBC\xA8" ) ; +define( "_AM_AVAMAN_TH_CODE" , "ɽ��������" ) ; +define( "_AM_AVAMAN_TH_EMOTION" , "��̣" ) ; +define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "�ƥ����ȥ��ꥢľ����ɽ��" ) ; -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/japanese/modinfo.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/japanese/modinfo.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/japanese/modinfo.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -1,10 +1,7 @@ <?php define( '_MI_AVAMAN_MODULENAME' , 'AVAMAN' ) ; -define( '_MI_AVAMAN_MODULEDESC' , '\xA4\xE2\xA4äȻȤ\xA4\xA4䤹\xA4\xA4\xA5\xA2\xA5Х\xBF\xA1\xBC\xB4\xC9\xCD\xFD\xA4\xF2\xA1\xAA' ) ; +define( '_MI_AVAMAN_MODULEDESC' , '��äȻȤ��䤹�����Х��������' ) ; -define( '_MI_AVAMAN_AVATARMANAGER' , '\xA5\xA2\xA5Х\xBF\xA1\xBC\xA5ޥ͡\xBC\xA5\xB8\xA5\xE3' ) ; -define( '_MI_AVAMAN_SMILIESMANAGER' , '\xB4饢\xA5\xA4\xA5\xB3\xA5\xF3\xA5ޥ͡\xBC\xA5\xB8\xA5\xE3' ) ; - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; \ No newline at end of file +define( '_MI_AVAMAN_AVATARMANAGER' , '���Х����ޥ͡�����' ) ; +define( '_MI_AVAMAN_SMILIESMANAGER' , '�饢������ޥ͡�����' ) ; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/persian/admin.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/persian/admin.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/persian/admin.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -20,5 +20,5 @@ define( "_AM_AVAMAN_TH_EMOTION" , "توضیح" ) ; define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "در صفحه اصلی متن نویسی نشان داده شود؟" ) ; -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/persian/modinfo.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/persian/modinfo.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/persian/modinfo.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -4,7 +4,4 @@ define( '_MI_AVAMAN_MODULEDESC' , 'مدیریت آسان لبخندکها و شکلکهای سیستم' ) ; define( '_MI_AVAMAN_AVATARMANAGER' , 'مدیریت شکلکها' ) ; -define( '_MI_AVAMAN_SMILIESMANAGER' , 'مدیریت لبخندکها' ) ; - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; \ No newline at end of file +define( '_MI_AVAMAN_SMILIESMANAGER' , 'مدیریت لبخندکها' ) ; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/polish/admin.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/polish/admin.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/polish/admin.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -1,24 +1,24 @@ <?php -define( "_AM_AVAMAN_DBUPDATED" , "Uaktualniono pomy\x9Clnie" ) ; -define( "_AM_AVAMAN_FILEUPLOADED" , "%s plik\xF3w dodano do bazy" ) ; -define( "_AM_AVAMAN_UPLOAD" , "Upload obrazk\xF3w (Mo\xBFesz tak\xBFe uplaodowa\xE6 w formacie zip lub tar.gz)" ) ; -define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "Nie mo\xBFna rozpakowa\xE6 archiwum" ) ; -define( "_AM_AVAMAN_INVALIDEXT" , "Nieprawid\xB3owy typ pliku" ) ; +define( "_AM_AVAMAN_DBUPDATED" , "Uaktualniono pomy�lnie" ) ; +define( "_AM_AVAMAN_FILEUPLOADED" , "%s plik�w dodano do bazy" ) ; +define( "_AM_AVAMAN_UPLOAD" , "Upload obrazk�w (Mo�esz tak�e uplaodowa� w formacie zip lub tar.gz)" ) ; +define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "Nie mo�na rozpakowa� archiwum" ) ; +define( "_AM_AVAMAN_INVALIDEXT" , "Nieprawid�owy typ pliku" ) ; define( "_AM_AVAMAN_TH_ID" , "id" ) ; define( "_AM_AVAMAN_TH_FILE" , "plik" ) ; define( "_AM_AVAMAN_TH_AVATARNAME" , "nazwa" ) ; define( "_AM_AVAMAN_TH_CREATED" , "utworzony" ) ; -define( "_AM_AVAMAN_TH_DISPLAY" , "wy\x9Cwietl" ) ; +define( "_AM_AVAMAN_TH_DISPLAY" , "wy�wietl" ) ; define( "_AM_AVAMAN_TH_WEIGHT" , "waga" ) ; -define( "_AM_AVAMAN_TH_USERS" , "u\xBFyte" ) ; -define( "_AM_AVAMAN_TH_DELETE" , "usu\xF1" ) ; +define( "_AM_AVAMAN_TH_USERS" , "u�yte" ) ; +define( "_AM_AVAMAN_TH_DELETE" , "usu�" ) ; define( "_AM_AVAMAN_CB_SELECTALL" , "zaznacz/odznacz wszystkie" ) ; define( "_AM_AVAMAN_TH_CODE" , "kod" ) ; define( "_AM_AVAMAN_TH_EMOTION" , "emotion" ) ; -define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "Wy\x9Cwietl w formularzach na stronie" ) ; +define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "Wy�wietl w formularzach na stronie" ) ; -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/polish/modinfo.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/polish/modinfo.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/polish/modinfo.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -4,7 +4,4 @@ define( '_MI_AVAMAN_MODULEDESC' , 'Managing system avatar easily' ) ; define( '_MI_AVAMAN_AVATARMANAGER' , 'Avatar Manager' ) ; -define( '_MI_AVAMAN_SMILIESMANAGER' , 'Smilies Manager' ) ; - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; \ No newline at end of file +define( '_MI_AVAMAN_SMILIESMANAGER' , 'Smilies Manager' ) ; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/spanish/admin.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/spanish/admin.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/spanish/admin.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -1,10 +1,10 @@ <?php -//Traducci\xF3n de Debianus para http://es.impresscms.org -define( "_AM_AVAMAN_DBUPDATED" , "Base de datos actualizada con \xE9xito" ) ; -define( "_AM_AVAMAN_FILEUPLOADED" , "%s archivos fueron registrados con \xE9xito" ) ; -define( "_AM_AVAMAN_UPLOAD" , "Archivos de imagen que ser\xE1n subidos al servidor (puede tambi\xE9n subir varios archivos a la vez comprimidos en un archivo zip o tar.gz)" ) ; +//Traducci�n de Debianus para http://es.impresscms.org +define( "_AM_AVAMAN_DBUPDATED" , "Base de datos actualizada con �xito" ) ; +define( "_AM_AVAMAN_FILEUPLOADED" , "%s archivos fueron registrados con �xito" ) ; +define( "_AM_AVAMAN_UPLOAD" , "Archivos de imagen que ser�n subidos al servidor (puede tambi�n subir varios archivos a la vez comprimidos en un archivo zip o tar.gz)" ) ; define( "_AM_AVAMAN_ERR_INVALIDARCHIVE" , "El archivo no puede ser descomprimido" ) ; -define( "_AM_AVAMAN_INVALIDEXT" , "Tipo de archivo no v\xE1lido" ) ; +define( "_AM_AVAMAN_INVALIDEXT" , "Tipo de archivo no v�lido" ) ; define( "_AM_AVAMAN_TH_ID" , "Id" ) ; define( "_AM_AVAMAN_TH_FILE" , "Archivo" ) ; @@ -16,9 +16,9 @@ define( "_AM_AVAMAN_TH_DELETE" , "Eliminar" ) ; define( "_AM_AVAMAN_CB_SELECTALL" , "Seleccionar/No seleccionar todos" ) ; -define( "_AM_AVAMAN_TH_CODE" , "C\xF3digo" ) ; -define( "_AM_AVAMAN_TH_EMOTION" , "Emoci\xF3n" ) ; -define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "Mostrar bajo el \xE1rea de texto" ) ; +define( "_AM_AVAMAN_TH_CODE" , "C�digo" ) ; +define( "_AM_AVAMAN_TH_EMOTION" , "Emoci�n" ) ; +define( "_AM_AVAMAN_TH_SMILEDISPLAY" , "Mostrar bajo el �rea de texto" ) ; -// Text for Admin footer -define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Avaman is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file +//ModuleAdmin +define('_AM_AVAMAN_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/language/spanish/modinfo.php =================================================================== --- XoopsModules/avaman/trunk/avaman/language/spanish/modinfo.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/language/spanish/modinfo.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -1,10 +1,7 @@ <?php define( '_MI_AVAMAN_MODULENAME' , 'AVAMAN' ) ; -define( '_MI_AVAMAN_MODULEDESC' , 'Sistema para gestionar f\xE1cilmente los avatares' ) ; +define( '_MI_AVAMAN_MODULEDESC' , 'Sistema para gestionar f�cilmente los avatares' ) ; -define( '_MI_AVAMAN_AVATARMANAGER' , 'Gesti\xF3n de Avatares' ) ; -define( '_MI_AVAMAN_SMILIESMANAGER' , 'Gesti\xF3n de Caritas (Smilies"' ) ; - -define( '_MI_AVAMAN_HOME' , 'Home' ) ; -define( '_MI_AVAMAN_ADMIN_ABOUT' , 'About' ) ; \ No newline at end of file +define( '_MI_AVAMAN_AVATARMANAGER' , 'Gesti�n de Avatares' ) ; +define( '_MI_AVAMAN_SMILIESMANAGER' , 'Gesti�n de Caritas (Smilies"' ) ; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/xoops_version.php =================================================================== --- XoopsModules/avaman/trunk/avaman/xoops_version.php 2012-04-02 22:07:19 UTC (rev 9239) +++ XoopsModules/avaman/trunk/avaman/xoops_version.php 2012-04-02 22:19:24 UTC (rev 9240) @@ -42,7 +42,7 @@ $modversion['module_website_url'] = "http://xoops.org"; $modversion['module_website_name'] = "XOOPS"; $modversion['release_date'] = "2011/12/04"; -$modversion['module_status'] = "RC"; +$modversion['module_status'] = "RC2"; $modversion["author_website_url"] = "http://www.peak.ne.jp"; $modversion["author_website_name"] = "GIJOE"; $modversion['min_php']='5.2'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-05-23 02:49:34
|
Revision: 9581 http://xoops.svn.sourceforge.net/xoops/?rev=9581&view=rev Author: beckmi Date: 2012-05-23 02:49:25 +0000 (Wed, 23 May 2012) Log Message: ----------- Updating to Final version Modified Paths: -------------- XoopsModules/avaman/trunk/avaman/admin/about.php XoopsModules/avaman/trunk/avaman/admin/admin_header.php XoopsModules/avaman/trunk/avaman/admin/avatars.php XoopsModules/avaman/trunk/avaman/admin/index.php XoopsModules/avaman/trunk/avaman/admin/smilies.php XoopsModules/avaman/trunk/avaman/docs/changelog.txt XoopsModules/avaman/trunk/avaman/include/Archive_Zip.php XoopsModules/avaman/trunk/avaman/language/persian/admin.php XoopsModules/avaman/trunk/avaman/language/persian/modinfo.php XoopsModules/avaman/trunk/avaman/xoops_version.php Modified: XoopsModules/avaman/trunk/avaman/admin/about.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/about.php 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/admin/about.php 2012-05-23 02:49:25 UTC (rev 9581) @@ -1,32 +1,32 @@ -<?php -/* - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -/** - * Avaman module - * - * @copyright The XOOPS Project (http://www.xoops.org) - * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} - * @package Avaman - * @since 2.5.0 - * @author GIJOE - * @version $Id $ - */ - -//include_once dirname(__FILE__) . '/admin_header.php'; -include 'admin_header.php'; -xoops_cp_header(); - -$aboutAdmin = new ModuleAdmin(); - -echo $aboutAdmin->addNavigation('about.php'); -echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); - +<?php +/* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * Avaman module + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package Avaman + * @since 2.5.0 + * @author GIJOE + * @version $Id $ + */ + +//include_once dirname(__FILE__) . '/admin_header.php'; +include 'admin_header.php'; +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); + include_once 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/admin/admin_header.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/admin_header.php 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/admin/admin_header.php 2012-05-23 02:49:25 UTC (rev 9581) @@ -1,46 +1,46 @@ -<?php -/* - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -/** - * Avaman module - * - * @copyright The XOOPS Project (http://www.xoops.org) - * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} - * @package Avaman - * @since 2.5.0 - * @author GIJOE - * @version $Id $ - */ - -$path = dirname(dirname(dirname(dirname(__FILE__)))); -include_once $path . '/mainfile.php'; -include_once $path . '/include/cp_functions.php'; -require_once $path . '/include/cp_header.php'; - -global $xoopsModule; - -$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); - -// Load language files -xoops_loadLanguage('admin', $thisModuleDir); -xoops_loadLanguage('modinfo', $thisModuleDir); -xoops_loadLanguage('main', $thisModuleDir); -xoops_loadLanguage('main', $thisModuleDir); - -$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); -$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); -$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); - -if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ - include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); - }else{ - redirect_header("../../../admin.php", 5, _AM_AVAMAN_MODULEADMIN_MISSING, false); +<?php +/* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * Avaman module + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package Avaman + * @since 2.5.0 + * @author GIJOE + * @version $Id $ + */ + +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; + +global $xoopsModule; + +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + }else{ + redirect_header("../../../admin.php", 5, _AM_AVAMAN_MODULEADMIN_MISSING, false); } \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/admin/avatars.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/avatars.php 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/admin/avatars.php 2012-05-23 02:49:25 UTC (rev 9581) @@ -206,14 +206,14 @@ echo " <tr> - <td class='$evenodd'>$avatar_id</td> - <td class='$evenodd'><img src='".XOOPS_UPLOAD_URL.'/'.urlencode($avatar_file)."' alt='' /></td> - <td class='$evenodd'><input type='text' size='24' name='avatar_names[$avatar_id]' value='".htmlspecialchars($avatar_name,ENT_QUOTES)."' /></td> - <td class='$evenodd'> ".formatTimestamp($avatar_created)."</td> - <td class='$evenodd'><input type='checkbox' name='avatar_displays[$avatar_id]' ".($avatar_display?"checked='checked'":"")." /></td> - <td class='$evenodd'><input type='text' size='4' name='avatar_weights[$avatar_id]' value='$avatar_weight' style='text-align:right;' /></td> - <td class='$evenodd' style='text-align:right;'>".intval($avatar_users)."</td> - <td class='$evenodd'><input type='checkbox' name='avatar_deletes[$avatar_id]' $delete_disabled /></td> + <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 " Modified: XoopsModules/avaman/trunk/avaman/admin/index.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/index.php 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/admin/index.php 2012-05-23 02:49:25 UTC (rev 9581) @@ -1,32 +1,32 @@ -<?php -/* - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -/** - * Avaman module - * - * @copyright The XOOPS Project (http://www.xoops.org) - * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} - * @package Avaman - * @since 2.5.0 - * @author GIJOE - * @version $Id $ - */ - -require_once '../../../include/cp_header.php'; -include 'admin_header.php'; -xoops_cp_header(); - - $indexAdmin = new ModuleAdmin(); - - echo $indexAdmin->addNavigation('index.php'); - echo $indexAdmin->renderIndex(); - +<?php +/* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * Avaman module + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package Avaman + * @since 2.5.0 + * @author GIJOE + * @version $Id $ + */ + +require_once '../../../include/cp_header.php'; +include 'admin_header.php'; +xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + + echo $indexAdmin->addNavigation('index.php'); + echo $indexAdmin->renderIndex(); + include "admin_footer.php"; \ No newline at end of file Modified: XoopsModules/avaman/trunk/avaman/admin/smilies.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/smilies.php 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/admin/smilies.php 2012-05-23 02:49:25 UTC (rev 9581) @@ -203,12 +203,12 @@ echo " <tr> - <td class='$evenodd'>$smiles_id</td> - <td class='$evenodd'><img src='".XOOPS_UPLOAD_URL.'/'.$file."' alt='' /></td> - <td class='$evenodd'><input type='text' size='12' name='codes[$smiles_id]' value='".htmlspecialchars($code,ENT_QUOTES)."' /></td> - <td class='$evenodd'><input type='text' size='24' name='emotions[$smiles_id]' value='".htmlspecialchars($emotion,ENT_QUOTES)."' /></td> - <td class='$evenodd'><input type='checkbox' name='displays[$smiles_id]' ".($display?"checked='checked'":"")." /></td> - <td class='$evenodd'><input type='checkbox' name='deletes[$smiles_id]' /></td> + <td class='$evenodd' align='center'>$smiles_id</td> + <td class='$evenodd' align='center'><img src='".XOOPS_UPLOAD_URL.'/'.$file."' alt='' /></td> + <td class='$evenodd' align='center'><input type='text' size='12' name='codes[$smiles_id]' value='".htmlspecialchars($code,ENT_QUOTES)."' /></td> + <td class='$evenodd' align='center'><input type='text' size='24' name='emotions[$smiles_id]' value='".htmlspecialchars($emotion,ENT_QUOTES)."' /></td> + <td class='$evenodd' align='center'><input type='checkbox' name='displays[$smiles_id]' ".($display?"checked='checked'":"")." /></td> + <td class='$evenodd' align='center'><input type='checkbox' name='deletes[$smiles_id]' /></td> </tr>\n" ; } echo " Modified: XoopsModules/avaman/trunk/avaman/docs/changelog.txt =================================================================== --- XoopsModules/avaman/trunk/avaman/docs/changelog.txt 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/docs/changelog.txt 2012-05-23 02:49:25 UTC (rev 9581) @@ -1,7 +1,7 @@ CHANGELOG: ================== -0.22 2011/12/04: +0.22 2012/05/22: ================= - converted to XOOPS ModuleAdmin GUI (mamba) Modified: XoopsModules/avaman/trunk/avaman/include/Archive_Zip.php =================================================================== --- XoopsModules/avaman/trunk/avaman/include/Archive_Zip.php 2012-05-23 02:42:41 UTC (rev 9580) +++ XoopsModules/avaman/trunk/avaman/include/Archive_Zip.php 2012-05-23 02:49:25 UTC (rev 9581) @@ -1,3606 +1,3606 @@ -<?php -/* vim: set ts=4 sw=4: */ -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2003 The PHP Group | -// +----------------------------------------------------------------------+ -// | This library is free software; you can redistribute it and/or | -// | modify it under the terms of the GNU Lesser General Public | -// | License as published by the Free Software Foundation; either | -// | version 2.1 of the License, or (at your option) any later version. | -// | | -// | This library is distributed in the hope that it will be useful, | -// | but WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | Lesser General Public License for more details. | -// | | -// | You should have received a copy of the GNU Lesser General Public | -// | License along with this library; if not, write to the Free Software | -// | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | -// | MA 02110-1301 USA | -// +----------------------------------------------------------------------+ -// | Author: Vincent Blavet <vi...@ph...> | -// +----------------------------------------------------------------------+ -// -// $Id: Zip.php,v 1.2 2005/11/21 06:51:57 vblavet Exp $ - -// require_once 'PEAR.php'; // GIJ - - // ----- Constants - define( 'ARCHIVE_ZIP_READ_BLOCK_SIZE', 2048 ); - - // ----- File list separator - define( 'ARCHIVE_ZIP_SEPARATOR', ',' ); - - // ----- Optional static temporary directory - // By default temporary files are generated in the script current - // path. - // If defined : - // - MUST BE terminated by a '/'. - // - MUST be a valid, already created directory - // Samples : - // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', '/temp/' ); - // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', 'C:/Temp/' ); - define( 'ARCHIVE_ZIP_TEMPORARY_DIR', '' ); - - // ----- Error codes - define( 'ARCHIVE_ZIP_ERR_NO_ERROR', 0 ); - define( 'ARCHIVE_ZIP_ERR_WRITE_OPEN_FAIL', -1 ); - define( 'ARCHIVE_ZIP_ERR_READ_OPEN_FAIL', -2 ); - define( 'ARCHIVE_ZIP_ERR_INVALID_PARAMETER', -3 ); - define( 'ARCHIVE_ZIP_ERR_MISSING_FILE', -4 ); - define( 'ARCHIVE_ZIP_ERR_FILENAME_TOO_LONG', -5 ); - define( 'ARCHIVE_ZIP_ERR_INVALID_ZIP', -6 ); - define( 'ARCHIVE_ZIP_ERR_BAD_EXTRACTED_FILE', -7 ); - define( 'ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL', -8 ); - define( 'ARCHIVE_ZIP_ERR_BAD_EXTENSION', -9 ); - define( 'ARCHIVE_ZIP_ERR_BAD_FORMAT', -10 ); - define( 'ARCHIVE_ZIP_ERR_DELETE_FILE_FAIL', -11 ); - define( 'ARCHIVE_ZIP_ERR_RENAME_FILE_FAIL', -12 ); - define( 'ARCHIVE_ZIP_ERR_BAD_CHECKSUM', -13 ); - define( 'ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP', -14 ); - define( 'ARCHIVE_ZIP_ERR_MISSING_OPTION_VALUE', -15 ); - define( 'ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE', -16 ); - - // ----- Warning codes - define( 'ARCHIVE_ZIP_WARN_NO_WARNING', 0 ); - define( 'ARCHIVE_ZIP_WARN_FILE_EXIST', 1 ); - - // ----- Methods parameters - define( 'ARCHIVE_ZIP_PARAM_PATH', 'path' ); - define( 'ARCHIVE_ZIP_PARAM_ADD_PATH', 'add_path' ); - define( 'ARCHIVE_ZIP_PARAM_REMOVE_PATH', 'remove_path' ); - define( 'ARCHIVE_ZIP_PARAM_REMOVE_ALL_PATH', 'remove_all_path' ); - define( 'ARCHIVE_ZIP_PARAM_SET_CHMOD', 'set_chmod' ); - define( 'ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING', 'extract_as_string' ); - define( 'ARCHIVE_ZIP_PARAM_NO_COMPRESSION', 'no_compression' ); - define( 'ARCHIVE_ZIP_PARAM_BY_NAME', 'by_name' ); - define( 'ARCHIVE_ZIP_PARAM_BY_INDEX', 'by_index' ); - define( 'ARCHIVE_ZIP_PARAM_BY_EREG', 'by_ereg' ); - define( 'ARCHIVE_ZIP_PARAM_BY_PREG', 'by_preg' ); - - define( 'ARCHIVE_ZIP_PARAM_PRE_EXTRACT', 'callback_pre_extract' ); - define( 'ARCHIVE_ZIP_PARAM_POST_EXTRACT', 'callback_post_extract' ); - define( 'ARCHIVE_ZIP_PARAM_PRE_ADD', 'callback_pre_add' ); - define( 'ARCHIVE_ZIP_PARAM_POST_ADD', 'callback_post_add' ); - - - -/** -* Class for manipulating zip archive files -* -* A class which provided common methods to manipulate ZIP formatted -* archive files. -* It provides creation, extraction, deletion and add features. -* -* @author Vincent Blavet <vi...@bl...> -* @version $Revision: 1.2 $ -* @package Archive_Zip -* @category Archive -*/ -class Archive_Zip -{ - /** - * The filename of the zip archive. - * - * @var string Name of the Zip file - */ - var $_zipname=''; - - /** - * File descriptor of the opened Zip file. - * - * @var int Internal zip file descriptor - */ - var $_zip_fd=0; - - /** - * @var int last error code - */ - var $_error_code=1; - - /** - * @var string Last error description - */ - var $_error_string=''; - - // {{{ constructor - /** - * Archive_Zip Class constructor. This flavour of the constructor only - * declare a new Archive_Zip object, identifying it by the name of the - * zip file. - * - * @param string $p_zipname The name of the zip archive to create - * @access public - */ - function Archive_Zip($p_zipname) - { - - // ----- Check the zlib -/* if (!extension_loaded('zlib')) { - PEAR::loadExtension('zlib'); - }*/ // GIJ - if (!extension_loaded('zlib')) { - die("The extension 'zlib' couldn't be found.\n". - "Please make sure your version of PHP was built ". - "with 'zlib' support.\n"); - return false; - } - - // ----- Set the attributes - $this->_zipname = $p_zipname; - $this->_zip_fd = 0; - - return; - } - // }}} - - // {{{ create() - /** - * This method creates a Zip Archive with the filename set with - * the constructor. - * The files and directories indicated in $p_filelist - * are added in the archive. - * When a directory is in the list, the directory and its content is added - * in the archive. - * The methods takes a variable list of parameters in $p_params. - * The supported parameters for this method are : - * 'add_path' : Add a path to the archived files. - * 'remove_path' : Remove the specified 'root' path of the archived files. - * 'remove_all_path' : Remove all the path of the archived files. - * 'no_compression' : The archived files will not be compressed. - * - * @access public - * @param mixed $p_filelist The list of the files or folders to add. - * It can be a string with filenames separated - * by a comma, or an array of filenames. - * @param mixed $p_params An array of variable parameters and values. - * @return mixed An array of file description on success, - * an error code on error - */ - function create($p_filelist, $p_params=0) - { - $this->_errorReset(); - - // ----- Set default values - if ($p_params === 0) { - $p_params = array(); - } - if ($this->_check_parameters($p_params, - array('no_compression' => false, - 'add_path' => "", - 'remove_path' => "", - 'remove_all_path' => false)) != 1) { - return 0; - } - - // ----- Look if the $p_filelist is really an array - $p_result_list = array(); - if (is_array($p_filelist)) { - $v_result = $this->_create($p_filelist, $p_result_list, $p_params); - } - - // ----- Look if the $p_filelist is a string - else if (is_string($p_filelist)) { - // ----- Create a list with the elements from the string - $v_list = explode(ARCHIVE_ZIP_SEPARATOR, $p_filelist); - - $v_result = $this->_create($v_list, $p_result_list, $p_params); - } - - // ----- Invalid variable - else { - $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, - 'Invalid variable type p_filelist'); - $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER; - } - - if ($v_result != 1) { - return 0; - } - - return $p_result_list; - } - // }}} - - // {{{ add() - /** - * This method add files or directory in an existing Zip Archive. - * If the Zip Archive does not exist it is created. - * The files and directories to add are indicated in $p_filelist. - * When a directory is in the list, the directory and its content is added - * in the archive. - * The methods takes a variable list of parameters in $p_params. - * The supported parameters for this method are : - * 'add_path' : Add a path to the archived files. - * 'remove_path' : Remove the specified 'root' path of the archived files. - * 'remove_all_path' : Remove all the path of the archived files. - * 'no_compression' : The archived files will not be compressed. - * 'callback_pre_add' : A callback function that will be called before - * each entry archiving. - * 'callback_post_add' : A callback function that will be called after - * each entry archiving. - * - * @access public - * @param mixed $p_filelist The list of the files or folders to add. - * It can be a string with filenames separated - * by a comma, or an array of filenames. - * @param mixed $p_params An array of variable parameters and values. - * @return mixed An array of file description on success, - * 0 on an unrecoverable failure, an error code is logged. - */ - function add($p_filelist, $p_params=0) - { - $this->_errorReset(); - - // ----- Set default values - if ($p_params === 0) { - $p_params = array(); - } - if ($this->_check_parameters($p_params, - array ('no_compression' => false, - 'add_path' => '', - 'remove_path' => '', - 'remove_all_path' => false, - 'callback_pre_add' => '', - 'callback_post_add' => '')) != 1) { - return 0; - } - - // ----- Look if the $p_filelist is really an array - $p_result_list = array(); - if (is_array($p_filelist)) { - // ----- Call the create fct - $v_result = $this->_add($p_filelist, $p_result_list, $p_params); - } - - // ----- Look if the $p_filelist is a string - else if (is_string($p_filelist)) { - // ----- Create a list with the elements from the string - $v_list = explode(ARCHIVE_ZIP_SEPARATOR, $p_filelist); - - // ----- Call the create fct - $v_result = $this->_add($v_list, $p_result_list, $p_params); - } - - // ----- Invalid variable - else { - $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, - "add() : Invalid variable type p_filelist"); - $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER; - } - - if ($v_result != 1) { - return 0; - } - - // ----- Return the result list - return $p_result_list; - } - // }}} - - // {{{ listContent() - /** - * This method gives the names and properties of the files and directories - * which are present in the zip archive. - * The properties of each entries in the list are : - * filename : Name of the file. - * For create() or add() it's the filename given by the user. - * For an extract() it's the filename of the extracted file. - * stored_filename : Name of the file / directory stored in the archive. - * size : Size of the stored file. - * compressed_size : Size of the file's data compressed in the archive - * (without the zip headers overhead) - * mtime : Last known modification date of the file (UNIX timestamp) - * comment : Comment associated with the file - * folder : true | false (indicates if the entry is a folder) - * index : index of the file in the archive (-1 when not available) - * status : status of the action on the entry (depending of the action) : - * Values are : - * ok : OK ! - * filtered : the file/dir was not extracted (filtered by user) - * already_a_directory : the file can't be extracted because a - * directory with the same name already - * exists - * write_protected : the file can't be extracted because a file - * with the same name already exists and is - * write protected - * newer_exist : the file was not extracted because a newer - * file already exists - * path_creation_fail : the file is not extracted because the - * folder does not exists and can't be - * created - * write_error : the file was not extracted because there was a - * error while writing the file - * read_error : the file was not extracted because there was a - * error while reading the file - * invalid_header : the file was not extracted because of an - * archive format error (bad file header) - * Note that each time a method can continue operating when there - * is an error on a single file, the error is only logged in the file status. - * - * @access public - * @return mixed An array of file description on success, - * 0 on an unrecoverable failure, an error code is logged. - */ - function listContent() - { - $this->_errorReset(); - - // ----- Check archive - if (!$this->_checkFormat()) { - return(0); - } - - $v_list = array(); - if ($this->_list($v_list) != 1) { - unset($v_list); - return(0); - } - - return $v_list; - } - // }}} - - // {{{ extract() - /** - * This method extract the files and folders which are in the zip archive. - * It can extract all the archive or a part of the archive by using filter - * feature (extract by name, by index, by ereg, by preg). The extraction - * can occur in the current path or an other path. - * All the advanced features are activated by the use of variable - * parameters. - * The return value is an array of entry descriptions which gives - * information on extracted files (See listContent()). - * The method may return a success value (an array) even if some files - * are not correctly extracted (see the file status in listContent()). - * The supported variable parameters for this method are : - * 'add_path' : Path where the files and directories are to be extracted - * 'remove_path' : First part ('root' part) of the memorized path - * (if similar) to remove while extracting. - * 'remove_all_path' : Remove all the memorized path while extracting. - * 'extract_as_string' : - * 'set_chmod' : After the extraction of the file the indicated mode - * will be set. - * 'by_name' : It can be a string with file/dir names separated by ',', - * or an array of file/dir names to extract from the archive. - * 'by_index' : A string with range of indexes separated by ',', - * (sample "1,3-5,12"). - * 'by_ereg' : A regular expression (ereg) that must match the extracted - * filename. - * 'by_preg' : A regular expression (preg) that must match the extracted - * filename. - * 'callback_pre_extract' : A callback function that will be called before - * each entry extraction. - * 'callback_post_extract' : A callback function that will be called after - * each entry extraction. - * - * @access public - * @param mixed $p_params An array of variable parameters and values. - * @return mixed An array of file description on success, - * 0 on an unrecoverable failure, an error code is logged. - */ - function extract($p_params=0) - { - - $this->_errorReset(); - - // ----- Check archive - if (!$this->_checkFormat()) { - return(0); - } - - // ----- Set default values - if ($p_params === 0) { - $p_params = array(); - } - if ($this->_check_parameters($p_params, - array ('extract_as_string' => false, - 'add_path' => '', - 'remove_path' => '', - 'remove_all_path' => false, - 'callback_pre_extract' => '', - 'callback_post_extract' => '', - 'set_chmod' => 0, - 'by_name' => '', - 'by_index' => '', - 'by_ereg' => '', - 'by_preg' => '') ) != 1) { - return 0; - } - - // ----- Call the extracting fct - $v_list = array(); - if ($this->_extractByRule($v_list, $p_params) != 1) { - unset($v_list); - return(0); - } - - return $v_list; - } - // }}} - - - // {{{ delete() - /** - * This methods delete archive entries in the zip archive. - * Notice that at least one filtering rule (set by the variable parameter - * list) must be set. - * Also notice that if you delete a folder entry, only the folder entry - * is deleted, not all the files bellonging to this folder. - * The supported variable parameters for this method are : - * 'by_name' : It can be a string with file/dir names separated by ',', - * or an array of file/dir names to delete from the archive. - * 'by_index' : A string with range of indexes separated by ',', - * (sample "1,3-5,12"). - * 'by_ereg' : A regular expression (ereg) that must match the extracted - * filename. - * 'by_preg' : A regular expression (preg) that must match the extracted - * filename. - * - * @access public - * @param mixed $p_params An array of variable parameters and values. - * @return mixed An array of file description on success, - * 0 on an unrecoverable failure, an error code is logged. - */ - function delete($p_params) - { - $this->_errorReset(); - - // ----- Check archive - if (!$this->_checkFormat()) { - return(0); - } - - // ----- Set default values - if ($this->_check_parameters($p_params, - array ('by_name' => '', - 'by_index' => '', - 'by_ereg' => '', - 'by_preg' => '') ) != 1) { - return 0; - } - - // ----- Check that at least one rule is set - if ( ($p_params['by_name'] == '') - && ($p_params['by_index'] == '') - && ($p_params['by_ereg'] == '') - && ($p_params['by_preg'] == '')) { - $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, - 'At least one filtering rule must' - .' be set as parameter'); - return 0; - } - - // ----- Call the delete fct - $v_list = array(); - if ($this->_deleteByRule($v_list, $p_params) != 1) { - unset($v_list); - return(0); - } - - return $v_list; - } - // }}} - - // {{{ properties() - /** - * This method gives the global properties of the archive. - * The properties are : - * nb : Number of files in the archive - * comment : Comment associated with the archive file - * status : not_exist, ok - * - * @access public - * @param mixed $p_params {Description} - * @return mixed An array with the global properties or 0 on error. - */ - function properties() - { - $this->_errorReset(); - - // ----- Check archive - if (!$this->_checkFormat()) { - return(0); - } - - // ----- Default properties - $v_prop = array(); - $v_prop['comment'] = ''; - $v_prop['nb'] = 0; - $v_prop['status'] = 'not_exist'; - - // ----- Look if file exists - if (@is_file($this->_zipname)) { - // ----- Open the zip file - if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) { - $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, - 'Unable to open archive \''.$this->_zipname - .'\' in binary read mode'); - return 0; - } - - // ----- Read the central directory informations - $v_central_dir = array(); - if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) { - return 0; - } - - $this->_closeFd(); - - // ----- Set the user attributes - $v_prop['comment'] = $v_central_dir['comment']; - $v_prop['nb'] = $v_central_dir['entries']; - $v_prop['status'] = 'ok'; - } - - return $v_prop; - } - // }}} - - - // {{{ duplicate() - /** - * This method creates an archive by copying the content of an other one. - * If the archive already exist, it is replaced by the new one without - * any warning. - * - * @access public - * @param mixed $p_archive It can be a valid Archive_Zip object or - * the filename of a valid zip archive. - * @return integer 1 on success, 0 on failure. - */ - function duplicate($p_archive) - { - $this->_errorReset(); - - // ----- Look if the $p_archive is a Archive_Zip object - if ( (is_object($p_archive)) - && (strtolower(get_class($p_archive)) == 'archive_zip')) { - $v_result = $this->_duplicate($p_archive->_zipname); - } - - // ----- Look if the $p_archive is a string (so a filename) - else if (is_string($p_archive)) { - // ----- Check that $p_archive is a valid zip file - // TBC : Should also check the archive format - if (!is_file($p_archive)) { - $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, - "No file with filename '".$p_archive."'"); - $v_result = ARCHIVE_ZIP_ERR_MISSING_FILE; - } - else { - $v_result = $this->_duplicate($p_archive); - } - } - - // ----- Invalid variable - else { - $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, - "Invalid variable type p_archive_to_add"); - $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER; - } - - return $v_result; - } - // }}} - - // {{{ merge() - /** - * This method merge a valid zip archive at the end of the - * archive identified by the Archive_Zip object. - * If the archive ($this) does not exist, the merge becomes a duplicate. - * If the archive to add does not exist, the merge is a success. - * - * @access public - * @param mixed $p_archive_to_add It can be a valid Archive_Zip object or - * the filename of a valid zip archive. - * @return integer 1 on success, 0 on failure. - */ - function merge($p_archive_to_add) - { - $v_result = 1; - $this->_errorReset(); - - // ----- Check archive - if (!$this->_checkFormat()) { - return(0); - } - - // ----- Look if the $p_archive_to_add is a Archive_Zip object - if ( (is_object($p_archive_to_add)) - && (strtolower(get_class($p_archive_to_add)) == 'archive_zip')) { - $v_result = $this->_merge($p_archive_to_add); - } - - // ----- Look if the $p_archive_to_add is a string (so a filename) - else if (is_string($p_archive_to_add)) { - // ----- Create a temporary archive - $v_object_archive = new Archive_Zip($p_archive_to_add); - - // ----- Merge the archive - $v_result = $this->_merge($v_object_archive); - } - - // ----- Invalid variable - else { - $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, - "Invalid variable type p_archive_to_add"); - $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER; - } - - return $v_result; - } - // }}} - - // {{{ errorCode() - /** - * Method that gives the lastest error code. - * - * @access public - * @return integer The error code value. - */ - function errorCode() - { - return($this->_error_code); - } - // }}} - - // {{{ errorName() - /** - * This method gives the latest error code name. - * - * @access public - * @param boolean $p_with_code If true, gives the name and the int value. - * @return string The error name. - */ - function errorName($p_with_code=false) - { - $v_const_list = get_defined_constants(); - - // ----- Extract error constants from all const. - for (reset($v_const_list); - list($v_key, $v_value) = each($v_const_list);) { - if (substr($v_key, 0, strlen('ARCHIVE_ZIP_ERR_')) - =='ARCHIVE_ZIP_ERR_') { - $v_error_list[$v_key] = $v_value; - } - } - - // ----- Search the name form the code value - $v_key=array_search($this->_error_code, $v_error_list, true); - if ($v_key!=false) { - $v_value = $v_key; - } - else { - $v_value = 'NoName'; - } - - if ($p_with_code) { - return($v_value.' ('.$this->_error_code.')'); - } - else { - return($v_value); - } - } - // }}} - - // {{{ errorInfo() - /** - * This method returns the description associated with the latest error. - * - * @access public - * @param boolean $p_full If set to true gives the description with the - * error code, the name and the description. - * If set to false gives only the description - * and the error code. - * @return string The error description. - */ - function errorInfo($p_full=false) - { - if ($p_full) { - return($this->errorName(true)." : ".$this->_error_string); - } - else { - return($this->_error_string." [code ".$this->_error_code."]"); - } - } - // }}} - - -// ----------------------------------------------------------------------------- -// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS ***** -// ***** ***** -// ***** THESES FUNCTIONS MUST NOT BE USED DIRECTLY ***** -// ----------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _checkFormat() - // Description : - // This method check that the archive exists and is a valid zip archive. - // Several level of check exists. (futur) - // Parameters : - // $p_level : Level of check. Default 0. - // 0 : Check the first bytes (magic codes) (default value)) - // 1 : 0 + Check the central directory (futur) - // 2 : 1 + Check each file header (futur) - // Return Values : - // true on success, - // false on error, the error code is set. - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_checkFormat() - * - * { Description } - * - * @param integer $p_level - */ - function _checkFormat($p_level=0) - { - $v_result = true; - - // ----- Reset the error handler - $this->_errorReset(); - - // ----- Look if the file exits - if (!is_file($this->_zipname)) { - // ----- Error log - $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, - "Missing archive file '".$this->_zipname."'"); - return(false); - } - - // ----- Check that the file is readeable - if (!is_readable($this->_zipname)) { - // ----- Error log - $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, - "Unable to read archive '".$this->_zipname."'"); - return(false); - } - - // ----- Check the magic code - // TBC - - // ----- Check the central header - // TBC - - // ----- Check each file header - // TBC - - // ----- Return - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _create() - // Description : - // Parameters : - // Return Values : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_create() - * - * { Description } - * - */ - function _create($p_list, &$p_result_list, &$p_params) - { - $v_result=1; - $v_list_detail = array(); - - $p_add_dir = $p_params['add_path']; - $p_remove_dir = $p_params['remove_path']; - $p_remove_all_dir = $p_params['remove_all_path']; - - // ----- Open the file in write mode - if (($v_result = $this->_openFd('wb')) != 1) - { - // ----- Return - return $v_result; - } - - // ----- Add the list of files - $v_result = $this->_addList($p_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params); - - // ----- Close - $this->_closeFd(); - - // ----- Return - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _add() - // Description : - // Parameters : - // Return Values : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_add() - * - * { Description } - * - */ - function _add($p_list, &$p_result_list, &$p_params) - { - $v_result=1; - $v_list_detail = array(); - - $p_add_dir = $p_params['add_path']; - $p_remove_dir = $p_params['remove_path']; - $p_remove_all_dir = $p_params['remove_all_path']; - - // ----- Look if the archive exists or is empty and need to be created - if ((!is_file($this->_zipname)) || (filesize($this->_zipname) == 0)) { - $v_result = $this->_create($p_list, $p_result_list, $p_params); - return $v_result; - } - - // ----- Open the zip file - if (($v_result=$this->_openFd('rb')) != 1) { - return $v_result; - } - - // ----- Read the central directory informations - $v_central_dir = array(); - if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) - { - $this->_closeFd(); - return $v_result; - } - - // ----- Go to beginning of File - @rewind($this->_zip_fd); - - // ----- Creates a temporay file - $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp'; - - // ----- Open the temporary file in write mode - if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) - { - $this->_closeFd(); - - $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, - 'Unable to open temporary file \'' - .$v_zip_temp_name.'\' in binary write mode'); - return Archive_Zip::errorCode(); - } - - // ----- Copy the files from the archive to the temporary file - // TBC : Here I should better append the file and go back to erase the - // central dir - $v_size = $v_central_dir['offset']; - while ($v_size != 0) - { - $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE - ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE); - $v_buffer = fread($this->_zip_fd, $v_read_size); - @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size); - $v_size -= $v_read_size; - } - - // ----- Swap the file descriptor - // Here is a trick : I swap the temporary fd with the zip fd, in order to - // use the following methods on the temporary fil and not the real archive - $v_swap = $this->_zip_fd; - $this->_zip_fd = $v_zip_temp_fd; - $v_zip_temp_fd = $v_swap; - - // ----- Add the files - $v_header_list = array(); - if (($v_result = $this->_addFileList($p_list, $v_header_list, - $p_add_dir, $p_remove_dir, - $p_remove_all_dir, $p_params)) != 1) - { - fclose($v_zip_temp_fd); - $this->_closeFd(); - @unlink($v_zip_temp_name); - - // ----- Return - return $v_result; - } - - // ----- Store the offset of the central dir - $v_offset = @ftell($this->_zip_fd); - - // ----- Copy the block of file headers from the old archive - $v_size = $v_central_dir['size']; - while ($v_size != 0) - { - $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE - ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE); - $v_buffer = @fread($v_zip_temp_fd, $v_read_size); - @fwrite($this->_zip_fd, $v_buffer, $v_read_size); - $v_size -= $v_read_size; - } - - // ----- Create the Central Dir files header - for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++) - { - // ----- Create the file header - if ($v_header_list[$i]['status'] == 'ok') { - if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) { - fclose($v_zip_temp_fd); - $this->_closeFd(); - @unlink($v_zip_temp_name); - - // ----- Return - return $v_result; - } - $v_count++; - } - - // ----- Transform the header to a 'usable' info - $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]); - } - - // ----- Zip file comment - $v_comment = ''; - - // ----- Calculate the size of the central header - $v_size = @ftell($this->_zip_fd)-$v_offset; - - // ----- Create the central dir footer - if (($v_result = $this->_writeCentralHeader($v_count - +$v_central_dir['entries'], - $v_size, $v_offset, - $v_comment)) != 1) { - // ----- Reset the file list - unset($v_header_list); - - // ----- Return - return $v_result; - } - - // ----- Swap back the file descriptor - $v_swap = $this->_zip_fd; - $this->_zip_fd = $v_zip_temp_fd; - $v_zip_temp_fd = $v_swap; - - // ----- Close - $this->_closeFd(); - - // ----- Close the temporary file - @fclose($v_zip_temp_fd); - - // ----- Delete the zip file - // TBC : I should test the result ... - @unlink($this->_zipname); - - // ----- Rename the temporary file - // TBC : I should test the result ... - //@rename($v_zip_temp_name, $this->_zipname); - $this->_tool_Rename($v_zip_temp_name, $this->_zipname); - - // ----- Return - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _openFd() - // Description : - // Parameters : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_openFd() - * - * { Description } - * - */ - function _openFd($p_mode) - { - $v_result=1; - - // ----- Look if already open - if ($this->_zip_fd != 0) - { - $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, - 'Zip file \''.$this->_zipname.'\' already open'); - return Archive_Zip::errorCode(); - } - - // ----- Open the zip file - if (($this->_zip_fd = @fopen($this->_zipname, $p_mode)) == 0) - { - $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, - 'Unable to open archive \''.$this->_zipname - .'\' in '.$p_mode.' mode'); - return Archive_Zip::errorCode(); - } - - // ----- Return - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _closeFd() - // Description : - // Parameters : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_closeFd() - * - * { Description } - * - */ - function _closeFd() - { - $v_result=1; - - if ($this->_zip_fd != 0) - @fclose($this->_zip_fd); - $this->_zip_fd = 0; - - // ----- Return - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _addList() - // Description : - // $p_add_dir and $p_remove_dir will give the ability to memorize a path which is - // different from the real path of the file. This is usefull if you want to have PclTar - // running in any directory, and memorize relative path from an other directory. - // Parameters : - // $p_list : An array containing the file or directory names to add in the tar - // $p_result_list : list of added files with their properties (specially the status field) - // $p_add_dir : Path to add in the filename path archived - // $p_remove_dir : Path to remove in the filename path archived - // Return Values : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_addList() - * - * { Description } - * - */ - function _addList($p_list, &$p_result_list, - $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params) - { - $v_result=1; - - // ----- Add the files - $v_header_list = array(); - if (($v_result = $this->_addFileList($p_list, $v_header_list, - $p_add_dir, $p_remove_dir, - $p_remove_all_dir, $p_params)) != 1) { - return $v_result; - } - - // ----- Store the offset of the central dir - $v_offset = @ftell($this->_zip_fd); - - // ----- Create the Central Dir files header - for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++) - { - // ----- Create the file header - if ($v_header_list[$i]['status'] == 'ok') { - if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) { - return $v_result; - } - $v_count++; - } - - // ----- Transform the header to a 'usable' info - $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]); - } - - // ----- Zip file comment - $v_comment = ''; - - // ----- Calculate the size of the central header - $v_size = @ftell($this->_zip_fd)-$v_offset; - - // ----- Create the central dir footer - if (($v_result = $this->_writeCentralHeader($v_count, $v_size, $v_offset, - $v_comment)) != 1) - { - // ----- Reset the file list - unset($v_header_list); - - // ----- Return - return $v_result; - } - - // ----- Return - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _addFileList() - // Description : - // $p_add_dir and $p_remove_dir will give the ability to memorize a path which is - // different from the real path of the file. This is usefull if you want to - // run the lib in any directory, and memorize relative path from an other directory. - // Parameters : - // $p_list : An array containing the file or directory names to add in the tar - // $p_result_list : list of added files with their properties (specially the status field) - // $p_add_dir : Path to add in the filename path archived - // $p_remove_dir : Path to remove in the filename path archived - // Return Values : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_addFileList() - * - * { Description } - * - */ - function _addFileList($p_list, &$p_result_list, - $p_add_dir, $p_remove_dir, $p_remove_all_dir, - &$p_params) - { - $v_result=1; - $v_header = array(); - - // ----- Recuperate the current number of elt in list - $v_nb = sizeof($p_result_list); - - // ----- Loop on the files - for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++) - { - // ----- Recuperate the filename - $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false); - - // ----- Skip empty file names - if ($p_filename == "") - { - continue; - } - - // ----- Check the filename - if (!file_exists($p_filename)) - { - $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, - "File '$p_filename' does not exists"); - return Archive_Zip::errorCode(); - } - - // ----- Look if it is a file or a dir with no all pathnre move - if ((is_file($p_filename)) || ((is_dir($p_filename)) && !$p_remove_all_dir)) { - // ----- Add the file - if (($v_result = $this->_addFile($p_filename, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1) - { - // ----- Return status - return $v_result; - } - - // ----- Store the file infos - $p_result_list[$v_nb++] = $v_header; - } - - // ----- Look for directory - if (is_dir($p_filename)) - { - - // ----- Look for path - if ($p_filename != ".") - $v_path = $p_filename."/"; - else - $v_path = ""; - - // ----- Read the directory for files and sub-directories - $p_hdir = opendir($p_filename); - $p_hitem = readdir($p_hdir); // '.' directory - $p_hitem = readdir($p_hdir); // '..' directory - while ($p_hitem = readdir($p_hdir)) - { - - // ----- Look for a file - if (is_file($v_path.$p_hitem)) - { - - // ----- Add the file - if (($v_result = $this->_addFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1) - { - // ----- Return status - return $v_result; - } - - // ----- Store the file infos - $p_result_list[$v_nb++] = $v_header; - } - - // ----- Recursive call to _addFileList() - else - { - - // ----- Need an array as parameter - $p_temp_list[0] = $v_path.$p_hitem; - $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params); - - // ----- Update the number of elements of the list - $v_nb = sizeof($p_result_list); - } - } - - // ----- Free memory for the recursive loop - unset($p_temp_list); - unset($p_hdir); - unset($p_hitem); - } - } - - return $v_result; - } - // --------------------------------------------------------------------------- - - // --------------------------------------------------------------------------- - // Function : _addFile() - // Description : - // Parameters : - // Return Values : - // --------------------------------------------------------------------------- - /** - * Archive_Zip::_addFile() - * - * { Description } - * - */ - function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params) - { - $v_result=1; - - if ($p_filename == "") - { - // ----- Error log - $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)"); - - // ----- Return - return Archive_Zip::errorCode(); - } - - // ----- Calculate the stored filename - $v_stored_filename = $p_filename; - - // ----- Look for all path to remove - if ($p_remove_all_dir) { - $v_stored_filename = basename($p_filename); - } - // ----- Look for partial path remove - else if ($p_remove_dir != "") - { - if (substr($p_remove_dir, -1) != '/') - $p_remove_dir .= "/"; - - if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) - { - if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) - $p_remove_dir = "./".$p_remove_dir; - if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) - $p_remove_dir = substr($p_remove_dir, 2); - } - - $v_compare = $this->_tool_PathInclusion($p_remove_dir, $p_filename); - if ($v_compare > 0) -// if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir) - { - - if ($v_compare == 2) { - $v_stored_filename = ""; - } - else { - $v_stored_filename = substr($p_filename, strlen($p_remove_dir)); - } - } - } - // ----- Look for path to add - if ($p_add_dir != "") - { - if (substr($p_add_dir, -1) == "/") - $v_stored_filename = $p_add_dir.$v_stored_filename; - else - $v_stored_filename = $p_add_dir."/".$v_stored_filename; - } - - // ----- Filename (reduce the path of stored name) - $v_stored_filename = $this->_tool_PathReduction($v_stored_filename); - - - /* filename length moved after call-back in release 1.3 - // ----- Check the path length - if (strlen($v_stored_filename) > 0xFF) - { - // ----- Error log - $this->_errorLog(-5, "Stored file name is too long (max. 255) : '$v_stored_filename'"); - - // ----- Return - return Archive_Zip::errorCode(); - } - */ - - // ----- Set the file properties - clearstatcache(); - $p_header['version'] = 20; - $p_header['version_extracted'] = 1... [truncated message content] |
From: <be...@us...> - 2012-08-08 06:32:31
|
Revision: 10015 http://xoops.svn.sourceforge.net/xoops/?rev=10015&view=rev Author: beckmi Date: 2012-08-08 06:32:25 +0000 (Wed, 08 Aug 2012) Log Message: ----------- small cosmetic updates Modified Paths: -------------- XoopsModules/avaman/trunk/avaman/admin/admin_footer.php XoopsModules/avaman/trunk/avaman/xoops_version.php Modified: XoopsModules/avaman/trunk/avaman/admin/admin_footer.php =================================================================== --- XoopsModules/avaman/trunk/avaman/admin/admin_footer.php 2012-08-07 19:42:33 UTC (rev 10014) +++ XoopsModules/avaman/trunk/avaman/admin/admin_footer.php 2012-08-08 06:32:25 UTC (rev 10015) @@ -22,7 +22,7 @@ echo "<div class='adminfooter'>\n" ." <div style='text-align: center;'>\n" - ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" ." </div>\n" ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" ."</div>"; Modified: XoopsModules/avaman/trunk/avaman/xoops_version.php =================================================================== --- XoopsModules/avaman/trunk/avaman/xoops_version.php 2012-08-07 19:42:33 UTC (rev 10014) +++ XoopsModules/avaman/trunk/avaman/xoops_version.php 2012-08-08 06:32:25 UTC (rev 10015) @@ -39,7 +39,7 @@ //about $modversion['demo_site_url'] = ""; $modversion['demo_site_name'] = ""; -$modversion['module_website_url'] = "http://xoops.org"; +$modversion['module_website_url'] = "www.xoops.org"; $modversion['module_website_name'] = "XOOPS"; $modversion['release_date'] = "2012/05/22"; $modversion['module_status'] = "Final"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |