From: <ant...@us...> - 2013-04-29 17:56:06
|
Revision: 11479 http://sourceforge.net/p/xoops/svn/11479 Author: antiquel Date: 2013-04-29 17:55:58 +0000 (Mon, 29 Apr 2013) Log Message: ----------- [ADD] APCal module's name appended to every language constant. [FIX] Bug with timezones causes events dates to be wierd in many ways. (Test version) Modified Paths: -------------- XoopsModules/APCal/trunk/LANG DIFF.txt XoopsModules/APCal/trunk/LANG TRANS.txt XoopsModules/APCal/trunk/modules/APCal/admin/admission.php XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php XoopsModules/APCal/trunk/modules/APCal/admin/categories.php XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php XoopsModules/APCal/trunk/modules/APCal/admin/events.php XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php XoopsModules/APCal/trunk/modules/APCal/admin/index.php XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php XoopsModules/APCal/trunk/modules/APCal/admin/mygroupperm.php XoopsModules/APCal/trunk/modules/APCal/admin/mytplsadmin.php XoopsModules/APCal/trunk/modules/APCal/admin/mytplsform.php XoopsModules/APCal/trunk/modules/APCal/admin/pluginsmanager.php XoopsModules/APCal/trunk/modules/APCal/blocks/apcal_monthly_calendar.php XoopsModules/APCal/trunk/modules/APCal/class/APCal.php XoopsModules/APCal/trunk/modules/APCal/class/APCal_xoops.php XoopsModules/APCal/trunk/modules/APCal/include/blocksadmin.inc.php XoopsModules/APCal/trunk/modules/APCal/include/preferences.inc.php XoopsModules/APCal/trunk/modules/APCal/language/english/admin.php XoopsModules/APCal/trunk/modules/APCal/language/english/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/english/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/english/main.php XoopsModules/APCal/trunk/modules/APCal/language/english/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/french/admin.php XoopsModules/APCal/trunk/modules/APCal/language/french/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/french/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/french/main.php XoopsModules/APCal/trunk/modules/APCal/language/french/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/german/admin.php XoopsModules/APCal/trunk/modules/APCal/language/german/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/german/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/german/main.php XoopsModules/APCal/trunk/modules/APCal/language/german/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/german/pical_constants.php XoopsModules/APCal/trunk/modules/APCal/language/italian/admin.php XoopsModules/APCal/trunk/modules/APCal/language/italian/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/italian/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/italian/main.php XoopsModules/APCal/trunk/modules/APCal/language/italian/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/japanese/admin.php XoopsModules/APCal/trunk/modules/APCal/language/japanese/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/japanese/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/japanese/main.php XoopsModules/APCal/trunk/modules/APCal/language/japanese/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/nederlands/admin.php XoopsModules/APCal/trunk/modules/APCal/language/nederlands/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/nederlands/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/nederlands/main.php XoopsModules/APCal/trunk/modules/APCal/language/nederlands/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/polish/admin.php XoopsModules/APCal/trunk/modules/APCal/language/polish/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/polish/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/polish/main.php XoopsModules/APCal/trunk/modules/APCal/language/polish/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/portuguese/admin.php XoopsModules/APCal/trunk/modules/APCal/language/portuguese/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/portuguese/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/portuguese/main.php XoopsModules/APCal/trunk/modules/APCal/language/portuguese/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/admin.php XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/main.php XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/russian/admin.php XoopsModules/APCal/trunk/modules/APCal/language/russian/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/russian/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/russian/main.php XoopsModules/APCal/trunk/modules/APCal/language/russian/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/spanish/admin.php XoopsModules/APCal/trunk/modules/APCal/language/spanish/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/spanish/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/spanish/main.php XoopsModules/APCal/trunk/modules/APCal/language/spanish/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/admin.php XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/main.php XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/swedish/admin.php XoopsModules/APCal/trunk/modules/APCal/language/swedish/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/swedish/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/swedish/main.php XoopsModules/APCal/trunk/modules/APCal/language/swedish/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/tchinese/admin.php XoopsModules/APCal/trunk/modules/APCal/language/tchinese/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/tchinese/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/tchinese/main.php XoopsModules/APCal/trunk/modules/APCal/language/tchinese/modinfo.php XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/admin.php XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/apcal_constants.php XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/blocks.php XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/main.php XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/modinfo.php XoopsModules/APCal/trunk/modules/APCal/shareCalendar.php XoopsModules/APCal/trunk/modules/APCal/templates/admin/apcal_index.html XoopsModules/APCal/trunk/modules/APCal/templates/apcal_monthly.html XoopsModules/APCal/trunk/modules/APCal/templates/blocks/apcal_coming_schedule.html XoopsModules/APCal/trunk/modules/APCal/templates/blocks/apcal_new_event.html XoopsModules/APCal/trunk/modules/APCal/templates/blocks/apcal_todays_schedule.html Modified: XoopsModules/APCal/trunk/LANG DIFF.txt =================================================================== --- XoopsModules/APCal/trunk/LANG DIFF.txt 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/LANG DIFF.txt 2013-04-29 17:55:58 UTC (rev 11479) @@ -160,10 +160,10 @@ - added _APCAL_MESSAGE - added _APCAL_TELLAFRIENDTEXT - admin.php - - added _AM_PREFS - - added _AM_UPDATE - - added _AM_BLOCKS - - added _AM_GOTOMODULE + - added _AM_APCAL_PREFS + - added _AM_APCAL_UPDATE + - added _AM_APCAL_BLOCKS + - added _AM_APCAL_GOTOMODULE - added _AM_APCAL_CANBEMAIN - added _AM_APCAL_COLOR @@ -183,7 +183,7 @@ - added _APCAL_SHARECALENDARFORM - added _APCAL_SHOWALLCAT - added _APCAL_GENERATE - - added _AP_GENERATEHINT + - added _APCAL_GENERATEHINT - added _APCAL_CATEGORIES - added _APCAL_NBEVENTS - added _APCAL_WIDTH @@ -227,18 +227,18 @@ - added _MI_APCAL_DISPLAYCATTITLE - admin.php - added _AM_APCAL_TIMEZONE - - added _AM_MODULEADMIN_CONFIG + - added _AM_APCAL_MODULEADMIN_CONFIG - added _AM_APCAL_NBWAITINGEVENTS - added _AM_APCAL_NBEVENTS - added _AM_APCAL_NBCATS - - added _AM_MODULEADMIN_CONFIG_PHP - - added _AM_MODULEADMIN_CONFIG_XOOPS - - added _AM_TITLE - - added _AM_SIDE - - added _AM_WEIGHT - - added _AM_VISIBLEIN - - added _AM_BCACHETIME - - added _AM_ACTION - - added _AM_ACTIVERIGHTS - - added _AM_ACCESSRIGHTS - - added _AM_BADMIN \ No newline at end of file + - added _AM_APCAL_MODULEADMIN_CONFIG_PHP + - added _AM_APCAL_MODULEADMIN_CONFIG_XOOPS + - added _AM_APCAL_TITLE + - added _AM_APCAL_SIDE + - added _AM_APCAL_WEIGHT + - added _AM_APCAL_VISIBLEIN + - added _AM_APCAL_BCACHETIME + - added _AM_APCAL_ACTION + - added _AM_APCAL_ACTIVERIGHTS + - added _AM_APCAL_ACCESSRIGHTS + - added _AM_APCAL_BADMIN \ No newline at end of file Modified: XoopsModules/APCal/trunk/LANG TRANS.txt =================================================================== --- XoopsModules/APCal/trunk/LANG TRANS.txt 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/LANG TRANS.txt 2013-04-29 17:55:58 UTC (rev 11479) @@ -101,7 +101,7 @@ define('_APCAL_SHARECALENDARFORM', 'Fill up that form to show the calendar on your website.'); define('_APCAL_SHOWALLCAT', 'All categories'); define('_APCAL_GENERATE', 'Generate'); -define('_AP_GENERATEHINT', 'You might have to click generate two times on certain browsers.'); +define('_APCAL_GENERATEHINT', 'You might have to click generate two times on certain browsers.'); define('_APCAL_CATEGORIES', 'categories'); define('_APCAL_NBEVENTS', 'Number of events displayed'); define('_APCAL_WIDTH', 'Block width'); @@ -150,16 +150,16 @@ admin.php (line 8) // Index define('_AM_APCAL_TIMEZONE', 'Timezones'); -define('_AM_MODULEADMIN_CONFIG', 'Configurations'); +define('_AM_APCAL_MODULEADMIN_CONFIG', 'Configurations'); define('_AM_APCAL_NBWAITINGEVENTS', 'There are %s events waiting for approval.'); define('_AM_APCAL_NBEVENTS', 'There are %s upcomming events.'); define('_AM_APCAL_NBCATS', 'There are %s categories.'); -define('_AM_MODULEADMIN_CONFIG_PHP', 'You must have at least php version %s (your current version is %s)'); -define('_AM_MODULEADMIN_CONFIG_XOOPS', 'You must have at least xoops version %s (your current version is %s)'); -define('_AM_PREFS', 'Preferences'); -define('_AM_UPDATE', 'Update'); -define('_AM_BLOCKS', 'Blocks'); -define('_AM_GOTOMODULE', 'Go to module'); +define('_AM_APCAL_MODULEADMIN_CONFIG_PHP', 'You must have at least php version %s (your current version is %s)'); +define('_AM_APCAL_MODULEADMIN_CONFIG_XOOPS', 'You must have at least xoops version %s (your current version is %s)'); +define('_AM_APCAL_PREFS', 'Preferences'); +define('_AM_APCAL_UPDATE', 'Update'); +define('_AM_APCAL_BLOCKS', 'Blocks'); +define('_AM_APCAL_GOTOMODULE', 'Go to module'); admin.php (line 125) define('_AM_APCAL_CANBEMAIN', 'Can be a main category'); @@ -167,15 +167,15 @@ admin.php (line 145) // Blocks & Groups Admin -define('_AM_TITLE', 'Title'); -define('_AM_SIDE', 'Location'); -define('_AM_WEIGHT', 'Weight'); -define('_AM_VISIBLEIN', 'Visible in'); -define('_AM_BCACHETIME', 'Cache time'); -define('_AM_ACTION', 'Action'); -define('_AM_ACTIVERIGHTS', 'Module administration rights'); -define('_AM_ACCESSRIGHTS', 'Module access rights'); -define('_AM_BADMIN', 'Blocks administration'); +define('_AM_APCAL_TITLE', 'Title'); +define('_AM_APCAL_SIDE', 'Location'); +define('_AM_APCAL_WEIGHT', 'Weight'); +define('_AM_APCAL_VISIBLEIN', 'Visible in'); +define('_AM_APCAL_BCACHETIME', 'Cache time'); +define('_AM_APCAL_ACTION', 'Action'); +define('_AM_APCAL_ACTIVERIGHTS', 'Module administration rights'); +define('_AM_APCAL_ACCESSRIGHTS', 'Module access rights'); +define('_AM_APCAL_BADMIN', 'Blocks administration'); apcal_constants.php (line 178) Modified: XoopsModules/APCal/trunk/modules/APCal/admin/admission.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/admission.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/admission.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -82,9 +82,9 @@ $serverTZ = $cal->server_TZ ; $userTZ = $xoopsUser->timezone() ; $tzoptions = " - <option value='s'>"._AM_TZOPT_SERVER."</option> - <option value='g'>"._AM_TZOPT_GMT."</option> - <option value='y'>"._AM_TZOPT_USER."</option>\n" ; + <option value='s'>"._AM_APCAL_TZOPT_SERVER."</option> + <option value='g'>"._AM_APCAL_TZOPT_GMT."</option> + <option value='y'>"._AM_APCAL_TZOPT_USER."</option>\n" ; switch( $tz ) { case 's' : $tzoffset = 0 ; @@ -118,7 +118,7 @@ } $sql = "UPDATE $cal->table SET admission=1 WHERE $whr 0" ; if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ; - else $mes = urlencode( _AM_MES_ADMITTED ) ; + else $mes = urlencode( _AM_APCAL_MES_ADMITTED ) ; foreach( $_POST[ 'ids' ] as $id ) { $cal->notify_new_event( $id ) ; } @@ -142,7 +142,7 @@ $records = mysql_affected_rows( $conn ) ; $sql = "DELETE FROM $cal->table WHERE $whr 0 " ; if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ; - else $mes = urlencode( "$records "._AM_MES_DELETED ) ; + else $mes = urlencode( "$records "._AM_APCAL_MES_DELETED ) ; } else { $mes = "" ; } @@ -186,7 +186,7 @@ xoops_cp_header(); require_once XOOPS_ROOT_PATH.'/modules/APCal/admin/displayMenu.php'; -echo "<h4>"._AM_ADMISSION."</h4> +echo "<h4>"._AM_APCAL_ADMISSION."</h4> <p><font color='blue'>".(isset($_GET['mes'])?htmlspecialchars($_GET['mes'],ENT_QUOTES):"")."</font></p> <form action='' method='get' style='margin-bottom:0px;text-align:left'> <select name='tz' onChange='submit();'>$tzoptions</select> @@ -203,7 +203,7 @@ <form action='' method='get' style='margin-bottom:0px;text-align:right'> $cat_selbox4extract <input type='text' name='txt' value='".htmlspecialchars($txt,ENT_QUOTES)."' /> - <input type='submit' value='"._AM_BUTTON_EXTRACT."' /> + <input type='submit' value='"._AM_APCAL_BUTTON_EXTRACT."' /> $nav_html <input type='hidden' name='num' value='$num' /> <input type='hidden' name='tz' value='$tz' /> @@ -214,11 +214,11 @@ <form name='MainForm' action='?tz=$tz&num=$num&cid=$cid' method='post' style='margin-top:0px;'> <table width='100%' class='outer' cellpadding='4' cellspacing='1'> <tr valign='middle'> - <th>"._AM_ADMIT_TH0."</th> - <th>"._AM_ADMIT_TH1."<br />($tzdisp)</th> - <th>"._AM_ADMIT_TH2."<br />($tzdisp)</th> - <th>"._AM_ADMIT_TH3."</th> - <th>"._AM_ADMIT_TH4."</th> + <th>"._AM_APCAL_ADMIT_TH0."</th> + <th>"._AM_APCAL_ADMIT_TH1."<br />($tzdisp)</th> + <th>"._AM_APCAL_ADMIT_TH2."<br />($tzdisp)</th> + <th>"._AM_APCAL_ADMIT_TH3."</th> + <th>"._AM_APCAL_ADMIT_TH4."</th> <th></th> <th><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th> </tr> @@ -230,11 +230,11 @@ while( $event = mysql_fetch_object( $rs ) ) { $oddeven = ( $oddeven == 'odd' ? 'even' : 'odd' ) ; if( $event->allday ) { - $start_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ; - $end_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ; + $start_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ; + $end_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ; } else { - $start_desc = date( _AM_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ; - $end_desc = date( _AM_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ; + $start_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ; + $end_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ; } $summary4disp = $myts->htmlSpecialChars( $event->summary ) ; echo " @@ -251,10 +251,10 @@ echo " <tr> - <td colspan='8' align='right' class='head'>"._AM_LABEL_ADMIT."<input type='submit' name='admit' value='"._AM_BUTTON_ADMIT."' /> "._AM_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_CONFIRM_DELETE."\")' /></td> + <td colspan='8' align='right' class='head'>"._AM_APCAL_LABEL_ADMIT."<input type='submit' name='admit' value='"._AM_APCAL_BUTTON_ADMIT."' /> "._AM_APCAL_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_DELETE."\")' /></td> </tr> <tr> - <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td> + <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td> </tr> </table> ".$xoopsGTicket->getTicketHtml( __LINE__ )." Modified: XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -59,7 +59,7 @@ } include( "mygroupperm.php" ) ; - redirect_header( XOOPS_URL."/modules/$mydirname/admin/cat2groupperm.php" , 1 , _MD_AM_DBUPDATED ); + redirect_header( XOOPS_URL."/modules/$mydirname/admin/cat2groupperm.php" , 1 , _MD_APCALAM_APCALDBUPDATED ); exit ; } @@ -67,7 +67,7 @@ // creating Objects of XOOPS $myts =& MyTextSanitizer::getInstance(); $cattree = new XoopsTree( $cat_table , "cid" , "pid" ) ; -$form = new MyXoopsGroupPermForm( _AM_MENU_CAT2GROUP , $xoopsModule->mid() , 'apcal_cat' , _AM_CAT2GROUPDESC ) ; +$form = new MyXoopsGroupPermForm( _AM_APCAL_MENU_CAT2GROUP , $xoopsModule->mid() , 'apcal_cat' , _AM_APCAL_CAT2GROUPDESC ) ; $cat_tree_array = $cattree->getChildTreeArray( 0 , 'weight ASC,cat_title' ) ; Modified: XoopsModules/APCal/trunk/modules/APCal/admin/categories.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/categories.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/categories.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -44,10 +44,10 @@ $form->addElement( new XoopsFormHidden( 'cid' , intval( $cat->cid ) ) ) ; // Subject - $form->addElement( new XoopsFormText( _AM_CAT_TH_TITLE , 'cat_title' , 60 , 128 , htmlspecialchars( $cat->cat_title , ENT_QUOTES ) ) , true ) ; + $form->addElement( new XoopsFormText( _AM_APCAL_CAT_TH_TITLE , 'cat_title' , 60 , 128 , htmlspecialchars( $cat->cat_title , ENT_QUOTES ) ) , true ) ; // Description - $tarea_tray = new XoopsFormElementTray( _AM_CAT_TH_DESC , '<br />' ) ; + $tarea_tray = new XoopsFormElementTray( _AM_APCAL_CAT_TH_DESC , '<br />' ) ; if ( class_exists( 'XoopsFormEditor' ) ) { $configs=array( 'name' => 'cat_desc', @@ -69,15 +69,15 @@ $cattree->makeMySelBox( "cat_title" , "weight" , $cat->pid , 1 , 'pid' ) ; $cat_selbox = ob_get_contents() ; ob_end_clean() ; - $form->addElement( new XoopsFormLabel( _AM_CAT_TH_PARENT , $cat_selbox ) ) ; + $form->addElement( new XoopsFormLabel( _AM_APCAL_CAT_TH_PARENT , $cat_selbox ) ) ; // Weight - $form->addElement( new XoopsFormText( _AM_CAT_TH_WEIGHT , 'weight', 6 , 6 , intval( $cat->weight ) ) , true ) ; + $form->addElement( new XoopsFormText( _AM_APCAL_CAT_TH_WEIGHT , 'weight', 6 , 6 , intval( $cat->weight ) ) , true ) ; // Options - $checkbox_tray = new XoopsFormElementTray( _AM_CAT_TH_OPTIONS , '<br />' ) ; + $checkbox_tray = new XoopsFormElementTray( _AM_APCAL_CAT_TH_OPTIONS , '<br />' ) ; $ismenuitem_checkbox = new XoopsFormCheckBox( '' , 'ismenuitem' , intval( $cat->ismenuitem ) ) ; - $ismenuitem_checkbox->addOption( 1 , _AM_CAT_TH_SUBMENU ) ; + $ismenuitem_checkbox->addOption( 1 , _AM_APCAL_CAT_TH_SUBMENU ) ; $checkbox_tray->addElement( $ismenuitem_checkbox ) ; $canbemain_checkbox = new XoopsFormCheckBox('', 'canbemain', intval($cat->canbemain)); $canbemain_checkbox->addOption(1, _AM_APCAL_CANBEMAIN); @@ -89,7 +89,7 @@ $form->addElement(new XoopsFormColorPicker(_AM_APCAL_COLOR, color, $color), false); // Last Modified - $form->addElement( new XoopsFormLabel( _AM_CAT_TH_LASTMODIFY , formatTimestamp( $cat->udtstamp ) ) ) ; + $form->addElement( new XoopsFormLabel( _AM_APCAL_CAT_TH_LASTMODIFY , formatTimestamp( $cat->udtstamp ) ) ) ; // Buttons $button_tray = new XoopsFormElementTray( '' , ' ' ) ; @@ -220,7 +220,7 @@ $sql .= ",color='".$_POST['color'].'\''; if( ! mysql_query( $sql , $conn ) ) die( mysql_error() ) ; rebuild_cat_tree( $cal->cat_table ) ; - $mes = urlencode( _AM_MB_CAT_INSERTED ) ; + $mes = urlencode( _AM_APCAL_MB_CAT_INSERTED ) ; $cal->redirect( "done=inserted&mes=$mes" ) ; exit ; @@ -241,7 +241,7 @@ $sql .= "WHERE cid='$cid'" ; if( ! mysql_query( $sql , $conn ) ) die( mysql_error() ) ; rebuild_cat_tree( $cal->cat_table ) ; - $mes = urlencode( _AM_MB_CAT_UPDATED ) ; + $mes = urlencode( _AM_APCAL_MB_CAT_UPDATED ) ; $cal->redirect( "done=updated&mes=$mes" ) ; exit ; @@ -283,7 +283,7 @@ // cat�ơ��֥뤫��κ�� if( ! mysql_query( "DELETE FROM $cal->cat_table WHERE $whr" , $conn ) ) die( mysql_error() ) ; rebuild_cat_tree( $cal->cat_table ) ; - $mes = urlencode( sprintf( _AM_FMT_CAT_DELETED , mysql_affected_rows() ) ) ; + $mes = urlencode( sprintf( _AM_APCAL_FMT_CAT_DELETED , mysql_affected_rows() ) ) ; $cal->redirect( "done=deleted&mes=$mes" ) ; exit ; @@ -304,7 +304,7 @@ $affected += mysql_affected_rows() ; } if( $affected > 0 ) rebuild_cat_tree( $cal->cat_table ) ; - $mes = urlencode( sprintf( _AM_FMT_CAT_BATCHUPDATED , $affected ) ) ; + $mes = urlencode( sprintf( _AM_APCAL_FMT_CAT_BATCHUPDATED , $affected ) ) ; $cal->redirect( "done=batch_updated&mes=$mes" ) ; exit ; @@ -323,7 +323,7 @@ $sql = "SELECT *,UNIX_TIMESTAMP(dtstamp) AS udtstamp FROM $cal->cat_table WHERE cid='$cid'" ; $crs = mysql_query( $sql , $conn ) ; $cat = mysql_fetch_object( $crs ) ; - display_edit_form( $cat , _AM_MENU_CAT_EDIT , 'update' ) ; + display_edit_form( $cat , _AM_APCAL_MENU_CAT_EDIT , 'update' ) ; } else if( $disp == "new" ) { @@ -332,15 +332,15 @@ $cat = new Dummy() ; $cat->pid = $cid ; $cat->udtstamp = time() ; - display_edit_form( $cat , _AM_MENU_CAT_NEW , 'insert' ) ; + display_edit_form( $cat , _AM_APCAL_MENU_CAT_NEW , 'insert' ) ; } else { - echo "<h4>"._AM_MENU_CATEGORIES."</h4>\n" ; + echo "<h4>"._AM_APCAL_MENU_CATEGORIES."</h4>\n" ; if( ! empty( $_GET['mes'] ) ) echo "<p><font color='blue'>".htmlspecialchars($_GET['mes'],ENT_QUOTES)."</font></p>" ; - echo "<p><a href='?disp=new&cid=0'>"._AM_MB_MAKETOPCAT."<img src='../images/cat_add.gif' width='18' height='15' alt='' /></a></p>\n" ; + echo "<p><a href='?disp=new&cid=0'>"._AM_APCAL_MB_MAKETOPCAT."<img src='../images/cat_add.gif' width='18' height='15' alt='' /></a></p>\n" ; // ���ƥ���ǡ������� $cat_tree_array = $cattree->getChildTreeArray( 0 , 'weight ASC,cat_title' ) ; @@ -352,10 +352,10 @@ <input type='hidden' name='delcat' value='' /> <table width='75%' class='outer' cellpadding='4' cellspacing='1'> <tr valign='middle'> - <th>"._AM_CAT_TH_TITLE."</th> - <th>"._AM_CAT_TH_OPERATION."</th> - <th>"._AM_CAT_TH_ENABLED."</th> - <th>"._AM_CAT_TH_WEIGHT."</th> + <th>"._AM_APCAL_CAT_TH_TITLE."</th> + <th>"._AM_APCAL_CAT_TH_OPERATION."</th> + <th>"._AM_APCAL_CAT_TH_ENABLED."</th> + <th>"._AM_APCAL_CAT_TH_WEIGHT."</th> </tr> " ; @@ -369,16 +369,16 @@ $enable_checked = $enabled ? "checked='checked'" : "" ; $cid = intval( $cid ) ; $cat_title = $myts->htmlSpecialChars( $cat_title ) ; - $del_confirm = 'confirm("' . sprintf( _AM_FMT_CATDELCONFIRM , $cat_title ) . '")' ; + $del_confirm = 'confirm("' . sprintf( _AM_APCAL_FMT_CATDELCONFIRM , $cat_title ) . '")' ; echo " <tr> <td class='$oddeven' width='100%'><a href='?disp=edit&cid=$cid'>$prefix $cat_title</a></td> <td class='$oddeven' align='center' nowrap='nowrap'> <a href='$mod_url/index.php?action=Edit&cid=$cid' target='_blank'><img src='$cal->images_url/addevent.gif' border='0' width='14' height='12' /></a> - <a href='?disp=edit&cid=$cid'><img src='../images/cat_edit.gif' width='18' height='15' alt='"._AM_MENU_CAT_EDIT."' title='"._AM_MENU_CAT_EDIT."' /></a> + <a href='?disp=edit&cid=$cid'><img src='../images/cat_edit.gif' width='18' height='15' alt='"._AM_APCAL_MENU_CAT_EDIT."' title='"._AM_APCAL_MENU_CAT_EDIT."' /></a> - <a href='?disp=new&cid=$cid'><img src='../images/cat_add.gif' width='18' height='15' alt='"._AM_MENU_CAT_NEW."' title='"._AM_MENU_CAT_NEW."' /></a> + <a href='?disp=new&cid=$cid'><img src='../images/cat_add.gif' width='18' height='15' alt='"._AM_APCAL_MENU_CAT_NEW."' title='"._AM_APCAL_MENU_CAT_NEW."' /></a> <input type='button' value='"._DELETE."' onclick='if($del_confirm){document.MainForm.delcat.value=\"$cid\"; submit();}' /> </td> @@ -390,10 +390,10 @@ // �ơ��֥�եå��� echo " <tr> - <td colspan='4' align='right' class='head'><input type='submit' name='batch_update' value='"._AM_BTN_UPDATE."' /></td> + <td colspan='4' align='right' class='head'><input type='submit' name='batch_update' value='"._AM_APCAL_BTN_UPDATE."' /></td> </tr> <tr> - <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td> + <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td> </tr> </table> </form> Modified: XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -7,10 +7,10 @@ // Get menu tab handler $menu_handler =& xoops_getmodulehandler('adminMenu', 'APCal'); // Define top navigation - $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid', 'e'), _AM_PREFS); - $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=modulesadmin&op=update&module=".$xoopsModule->getVar('dirname', 'e'), _AM_UPDATE); - $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=".$xoopsModule->getVar('mid', 'e')."&selmod=-2&selgrp=-1&selvis=-1", _AM_BLOCKS); - $menu_handler->addMenuTop(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname', 'e')."/", _AM_GOTOMODULE); + $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=preferences&op=showmod&mod=".$xoopsModule->getVar('mid', 'e'), _AM_APCAL_PREFS); + $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=modulesadmin&op=update&module=".$xoopsModule->getVar('dirname', 'e'), _AM_APCAL_UPDATE); + $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=".$xoopsModule->getVar('mid', 'e')."&selmod=-2&selgrp=-1&selvis=-1", _AM_APCAL_BLOCKS); + $menu_handler->addMenuTop(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname', 'e')."/", _AM_APCAL_GOTOMODULE); // Define main tab navigation $i=0; foreach ($xoopsModule->adminmenu as $menu) @@ -22,7 +22,7 @@ if ($xoopsModule->getInfo('help')) { if ( stripos( $_SERVER['REQUEST_URI'], 'admin/' . $xoopsModule->getInfo('help') ) !== false ) $current = $i; - $menu_handler->addMenuTabs( '../system/help.php?mid=' . $xoopsModule->getVar('mid', 's') . '&page=' . $xoopsModule->getInfo('help'), _AM_SYSTEM_HELP); + $menu_handler->addMenuTabs( '../system/help.php?mid=' . $xoopsModule->getVar('mid', 's') . '&page=' . $xoopsModule->getInfo('help'), _AM_APCAL_SYSTEM_HELP); } // Display navigation tabs Modified: XoopsModules/APCal/trunk/modules/APCal/admin/events.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/events.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/events.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -73,9 +73,9 @@ // ��̤��ˤ��ʤ���ߡʥǥե���Ȥ�̤��� $pf_options = " - <option value='future'>"._AM_OPT_FUTURE."</option> - <option value='past'>"._AM_OPT_PAST."</option> - <option value='pandf'>"._AM_OPT_PASTANDFUTURE."</option>\n" ; + <option value='future'>"._AM_APCAL_OPT_FUTURE."</option> + <option value='past'>"._AM_APCAL_OPT_PAST."</option> + <option value='pandf'>"._AM_APCAL_OPT_PASTANDFUTURE."</option>\n" ; $pf = empty( $_GET['pf'] ) ? 'future' : preg_replace( '/[^a-zA-Z0-9_-]/' , '' , $_GET['pf'] ) ; switch( $pf ) { case 'past' : @@ -106,9 +106,9 @@ $serverTZ = $cal->server_TZ ; $userTZ = $xoopsUser->timezone() ; $tzoptions = " - <option value='s'>"._AM_TZOPT_SERVER."</option> - <option value='g'>"._AM_TZOPT_GMT."</option> - <option value='y'>"._AM_TZOPT_USER."</option>\n" ; + <option value='s'>"._AM_APCAL_TZOPT_SERVER."</option> + <option value='g'>"._AM_APCAL_TZOPT_GMT."</option> + <option value='y'>"._AM_APCAL_TZOPT_USER."</option>\n" ; switch( $tz ) { case 's' : $tzoffset = 0 ; @@ -149,7 +149,7 @@ $records = mysql_affected_rows( $conn ) ; $sql = "DELETE FROM $cal->table WHERE $whr 0 " ; if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ; - else $mes = urlencode( "$records "._AM_MES_DELETED ) ; + else $mes = urlencode( "$records "._AM_APCAL_MES_DELETED ) ; } else { $mes = "" ; } @@ -173,7 +173,7 @@ $sql = "UPDATE $cal->table SET categories=CONCAT(categories,'$cid4sql') WHERE ($whr 0) AND categories NOT LIKE '%$cid4sql%'" ; if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ; $records = mysql_affected_rows( $conn ) ; - $mes = urlencode( "$records "._AM_MES_EVENTLINKTOCAT ) ; + $mes = urlencode( "$records "._AM_APCAL_MES_EVENTLINKTOCAT ) ; $cal->redirect( "cid=$cid&num=$num&tz=$tz&done=copied&mes=$mes" ) ; exit ; @@ -196,8 +196,8 @@ $sql = "UPDATE $cal->table SET categories=REPLACE(categories,'$old_cid4sql','$cid4sql') WHERE ($whr 0)" ; if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ; $records = mysql_affected_rows( $conn ) ; - if( $cid > 0 ) $mes = urlencode( "$records "._AM_MES_EVENTLINKTOCAT ) ; - else $mes = urlencode( "$records "._AM_MES_EVENTUNLINKED ) ; + if( $cid > 0 ) $mes = urlencode( "$records "._AM_APCAL_MES_EVENTLINKTOCAT ) ; + else $mes = urlencode( "$records "._AM_APCAL_MES_EVENTUNLINKED ) ; $cal->redirect( "cid=$old_cid&num=$num&tz=$tz&done=moved&mes=$mes" ) ; exit ; @@ -262,7 +262,7 @@ require_once XOOPS_ROOT_PATH.'/modules/APCal/admin/displayMenu.php'; echo " -<h4>"._AM_MENU_EVENTS."</h4> +<h4>"._AM_APCAL_MENU_EVENTS."</h4> <p><font color='blue'>".(isset($_GET['mes'])?htmlspecialchars($_GET['mes'],ENT_QUOTES):"")."</font></p>\n" . ( isset( $confirm_html ) ? $confirm_html : "" ) ." <form action='' method='get' style='margin-bottom:0px;text-align:left'> @@ -283,7 +283,7 @@ </select> $cat_selbox4extract <input type='text' name='txt' value='".htmlspecialchars($txt,ENT_QUOTES)."' /> - <input type='submit' value='"._AM_BUTTON_EXTRACT."' /> + <input type='submit' value='"._AM_APCAL_BUTTON_EXTRACT."' /> $nav_html <input type='hidden' name='num' value='$num' /> <input type='hidden' name='tz' value='$tz' /> @@ -295,12 +295,12 @@ ".$xoopsGTicket->getTicketHtml( __LINE__ )." <table width='100%' class='outer' cellpadding='4' cellspacing='1'> <tr valign='middle'> - <th>"._AM_IO_TH0."</th> - <th>"._AM_IO_TH1."<br />($tzdisp)</th> - <th>"._AM_IO_TH2."<br />($tzdisp)</th> - <th>"._AM_IO_TH3."</th> - <th>"._AM_IO_TH4."</th> - <th>"._AM_IO_TH5."</th> + <th>"._AM_APCAL_IO_TH0."</th> + <th>"._AM_APCAL_IO_TH1."<br />($tzdisp)</th> + <th>"._AM_APCAL_IO_TH2."<br />($tzdisp)</th> + <th>"._AM_APCAL_IO_TH3."</th> + <th>"._AM_APCAL_IO_TH4."</th> + <th>"._AM_APCAL_IO_TH5."</th> <th></th> <th><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th> </tr> @@ -312,11 +312,11 @@ while( $event = mysql_fetch_object( $rs ) ) { $oddeven = ( $oddeven == 'odd' ? 'even' : 'odd' ) ; if( $event->allday ) { - $start_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ; - $end_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ; + $start_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ; + $end_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ; } else { - $start_desc = date( _AM_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ; - $end_desc = date( _AM_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ; + $start_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ; + $end_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ; } $summary4disp = $myts->htmlSpecialChars( $event->summary ) ; echo " @@ -335,14 +335,14 @@ echo " <tr> <td colspan='8' align='right' class='head'> - "._AM_LABEL_IO_CHECKEDITEMS." "._AM_LABEL_IO_OUTPUT."<input type='submit' name='output_ics_confirm' value='"._APCAL_BTN_EXPORT."' /> "._AM_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_CONFIRM_DELETE."\")' /><br /> + "._AM_APCAL_LABEL_IO_CHECKEDITEMS." "._AM_APCAL_LABEL_IO_OUTPUT."<input type='submit' name='output_ics_confirm' value='"._APCAL_BTN_EXPORT."' /> "._AM_APCAL_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_DELETE."\")' /><br /> <br /> - $cat_selbox <input type='submit' name='movelink' value='"._AM_BUTTON_MOVE."' onclick='return confirm(\""._AM_CONFIRM_MOVE."\")' ".($cid<=0?"disabled='disabled'":"")." /> <input type='submit' name='addlink' value='"._AM_BUTTON_COPY."' onclick='return confirm(\""._AM_CONFIRM_COPY."\")' /> + $cat_selbox <input type='submit' name='movelink' value='"._AM_APCAL_BUTTON_MOVE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_MOVE."\")' ".($cid<=0?"disabled='disabled'":"")." /> <input type='submit' name='addlink' value='"._AM_APCAL_BUTTON_COPY."' onclick='return confirm(\""._AM_APCAL_CONFIRM_COPY."\")' /> <input type='hidden' name='old_cid' value='$cid' /> </td> </tr> <tr> - <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td> + <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td> </tr> </table> </form> Modified: XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -55,22 +55,22 @@ } include( "mygroupperm.php" ) ; - redirect_header( XOOPS_URL."/modules/$mydirname/admin/groupperm.php" , 1 , _MD_AM_DBUPDATED ); + redirect_header( XOOPS_URL."/modules/$mydirname/admin/groupperm.php" , 1 , _MD_APCALAM_APCALDBUPDATED ); exit ; } $item_list = array( - '1' => _AM_GPERM_G_INSERTABLE , - '2' => _AM_GPERM_G_SUPERINSERT , - '4' => _AM_GPERM_G_EDITABLE , - '8' => _AM_GPERM_G_SUPEREDIT , -// '16' => _AM_GPERM_G_DELETABLE , - '32' => _AM_GPERM_G_SUPERDELETE -// '64' => _AM_GPERM_G_TOUCHOTHERS + '1' => _AM_APCAL_GPERM_G_INSERTABLE , + '2' => _AM_APCAL_GPERM_G_SUPERINSERT , + '4' => _AM_APCAL_GPERM_G_EDITABLE , + '8' => _AM_APCAL_GPERM_G_SUPEREDIT , +// '16' => _AM_APCAL_GPERM_G_DELETABLE , + '32' => _AM_APCAL_GPERM_G_SUPERDELETE +// '64' => _AM_APCAL_GPERM_G_TOUCHOTHERS ) ; -$form = new MyXoopsGroupPermForm( _AM_GROUPPERM , $xoopsModule->mid() , 'apcal_global' , _AM_GROUPPERMDESC ) ; +$form = new MyXoopsGroupPermForm( _AM_APCAL_GROUPPERM , $xoopsModule->mid() , 'apcal_global' , _AM_APCAL_GROUPPERMDESC ) ; foreach( $item_list as $item_id => $item_name) { $form->addItem( $item_id , $item_name ) ; } Modified: XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -71,9 +71,9 @@ $serverTZ = $cal->server_TZ ; $userTZ = $xoopsUser->timezone() ; $tzoptions = " - <option value='s'>"._AM_TZOPT_SERVER."</option> - <option value='g'>"._AM_TZOPT_GMT."</option> - <option value='y'>"._AM_TZOPT_USER."</option>\n" ; + <option value='s'>"._AM_APCAL_TZOPT_SERVER."</option> + <option value='g'>"._AM_APCAL_TZOPT_GMT."</option> + <option value='y'>"._AM_APCAL_TZOPT_USER."</option>\n" ; switch( $tz ) { case 's' : $tzoffset = 0 ; @@ -108,7 +108,7 @@ $cal->redirect( "done=error&mes=$mes" ) ; exit ; } else { - $mes = urlencode( sprintf( "$records "._AM_FMT_IMPORTED , $calname ) ) ; + $mes = urlencode( sprintf( "$records "._AM_APCAL_FMT_IMPORTED , $calname ) ) ; $cal->redirect( "done=imported&mes=$mes" ) ; exit ; } @@ -127,7 +127,7 @@ $cal->redirect( "done=error&mes=$mes" ) ; exit ; } else { - $mes = urlencode( sprintf( "$records "._AM_FMT_IMPORTED , $calname ) ) ; + $mes = urlencode( sprintf( "$records "._AM_APCAL_FMT_IMPORTED , $calname ) ) ; $cal->redirect( "done=imported&mes=$mes" ) ; exit ; } @@ -151,7 +151,7 @@ $records = mysql_affected_rows( $conn ) ; $sql = "DELETE FROM $cal->table WHERE $whr 0 " ; if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ; - else $mes = urlencode( "$records "._AM_MES_DELETED ) ; + else $mes = urlencode( "$records "._AM_APCAL_MES_DELETED ) ; } else { $mes = "" ; } @@ -186,16 +186,16 @@ $xoopsGTicket->clear() ; echo " -<h4>"._AM_ICALENDAR_IMPORT."</h4> +<h4>"._AM_APCAL_ICALENDAR_IMPORT."</h4> <p><font color='blue'>".(isset($_GET['mes'])?htmlspecialchars($_GET['mes'],ENT_QUOTES):"")."</font></p> <form action='?tz=$tz&num=$num' method='post'> - "._AM_LABEL_IMPORTFROMWEB."<br /> + "._AM_APCAL_LABEL_IMPORTFROMWEB."<br /> <input type='text' name='import_uri' size='80'> <input type='submit' name='http_import' value='"._APCAL_BTN_IMPORT."'> ".$xoopsGTicket->getTicketHtml( __LINE__ )." </form> <form action='?tz=$tz&num=$num' method='post' enctype='multipart/form-data'> - "._AM_LABEL_UPLOADFROMFILE."<br /> + "._AM_APCAL_LABEL_UPLOADFROMFILE."<br /> <input type='hidden' name='MAX_FILE_SIZE' value='65536'> <input type='file' name='user_ics' size='72'> <input type='submit' name='local_import' value='"._APCAL_BTN_UPLOAD."'> @@ -223,12 +223,12 @@ ".$xoopsGTicket->getTicketHtml( __LINE__ )." <table width='100%' class='outer' cellpadding='4' cellspacing='1'> <tr valign='middle'> - <th>"._AM_IO_TH0."</th> - <th>"._AM_IO_TH1."<br />($tzdisp)</th> - <th>"._AM_IO_TH2."<br />($tzdisp)</th> - <th>"._AM_IO_TH3."</th> - <th>"._AM_IO_TH4."</th> - <th>"._AM_IO_TH5."</th> + <th>"._AM_APCAL_IO_TH0."</th> + <th>"._AM_APCAL_IO_TH1."<br />($tzdisp)</th> + <th>"._AM_APCAL_IO_TH2."<br />($tzdisp)</th> + <th>"._AM_APCAL_IO_TH3."</th> + <th>"._AM_APCAL_IO_TH4."</th> + <th>"._AM_APCAL_IO_TH5."</th> <th></th> <th><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th> </tr> @@ -243,11 +243,11 @@ if( $count ++ < $new_imported ) $newer_style = "style='background-color:#FFFFCC;'" ; else $newer_style = '' ; if( $event->allday ) { - $start_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ; - $end_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ; + $start_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ; + $end_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ; } else { - $start_desc = date( _AM_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ; - $end_desc = date( _AM_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ; + $start_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ; + $end_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ; } $summary4disp = $myts->htmlSpecialChars( $event->summary ) ; echo " @@ -265,10 +265,10 @@ echo " <tr> - <td colspan='8' align='right' class='head'>"._AM_LABEL_IO_CHECKEDITEMS." "._AM_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_CONFIRM_DELETE."\")' /></td> + <td colspan='8' align='right' class='head'>"._AM_APCAL_LABEL_IO_CHECKEDITEMS." "._AM_APCAL_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_DELETE."\")' /></td> </tr> <tr> - <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td> + <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td> </tr> </table> </form> Modified: XoopsModules/APCal/trunk/modules/APCal/admin/index.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/index.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/index.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -59,7 +59,7 @@ $infoBoxes[_MI_APCAL_ADMENU1][] = sprintf(_AM_APCAL_NBWAITINGEVENTS, '<span style="color:'.($nbWaitingEvents>0 ? '#aa0000' : '#00aa00').'; font-weight : bold;">'.$nbWaitingEvents.'</span>'); $infoBoxes[_MI_APCAL_ADMENU1][] = sprintf(_AM_APCAL_NBEVENTS, '<span style="font-weight : bold;">'.$nbEvents.'</span>'); $infoBoxes[_MI_APCAL_ADMENU_CAT][] = sprintf(_AM_APCAL_NBCATS, '<span style="font-weight : bold;">'.$nbCats.'</span>'); -$infoBoxes[_AM_APCAL_TIMEZONE][] = sprintf(_AM_FMT_SERVER_TZ_ALL, date('Z', 1104537600)/3600, date('Z', 1120176000)/3600, date('T'), $xoopsConfig['server_TZ'], $cal->server_TZ); +$infoBoxes[_AM_APCAL_TIMEZONE][] = sprintf(_AM_APCAL_FMT_SERVER_TZ_ALL, date('Z', 1104537600)/3600, date('Z', 1120176000)/3600, date('T'), $xoopsConfig['server_TZ'], $cal->server_TZ); $xoopsModule->loadAdminMenu(); Modified: XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -99,7 +99,7 @@ ADD cid smallint(5) unsigned zerofill NOT NULL default '0' AFTER end, ADD end_date date AFTER end, ADD start_date date AFTER end" ; - if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_MB_FAILUPDATETABLE ) ; + if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_APCAL_MB_FAILUPDATETABLE ) ; // TimeZones of all records $sql = "UPDATE $table_event SET @@ -107,11 +107,11 @@ server_tz = $serverTZ, poster_tz = tzid, event_tz = tzid" ; - if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_MB_FAILUPDATETABLE ) ; + if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_APCAL_MB_FAILUPDATETABLE ) ; // older tzid field update $sql = "UPDATE $table_event SET dtstamp=dtstamp,tzid='',event_tz=9.0,poster_tz=9.0 WHERE tzid='Japan'" ; - if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_MB_FAILUPDATETABLE ) ; + if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_APCAL_MB_FAILUPDATETABLE ) ; // Counting comments $sql = 'SELECT com_itemid,count(*) FROM ' . $xoopsDB->prefix('xoopscomments') . " WHERE com_modid=$mid GROUP BY com_itemid" ; @@ -122,7 +122,7 @@ xoops_cp_header(); echo $xoopsLogger->dumpQueries(); - redirect_header( $php_self , 5 , _AM_MB_SUCCESSUPDATETABLE ) ; + redirect_header( $php_self , 5 , _AM_APCAL_MB_SUCCESSUPDATETABLE ) ; } else if( ! empty( $_POST['create_cat'] ) ) { @@ -154,7 +154,7 @@ xoops_cp_header(); echo $xoopsLogger->dumpQueries(); - redirect_header( $php_self , 5 , _AM_MB_SUCCESSUPDATETABLE ) ; + redirect_header( $php_self , 5 , _AM_APCAL_MB_SUCCESSUPDATETABLE ) ; } else if( ! empty( $_POST['repair_stz'] ) ) { @@ -178,7 +178,7 @@ xoops_cp_header(); echo $xoopsLogger->dumpQueries(); - redirect_header( $php_self , 5 , _AM_MB_SUCCESSTZUPDATE ) ; + redirect_header( $php_self , 5 , _AM_APCAL_MB_SUCCESSTZUPDATE ) ; } @@ -198,13 +198,13 @@ if( ! $is_040 ) { OpenTable() ; - echo _AM_ALRT_TOOOLDTABLE ; + echo _AM_APCAL_ALRT_TOOOLDTABLE ; CloseTable() ; } else if( ! $is_060 ) { OpenTable() ; - echo _AM_ALRT_OLDTABLE ; + echo _AM_APCAL_ALRT_OLDTABLE ; echo " <br />(0.4x, 0.5x -> 0.6) <form action='' method='post'> @@ -216,7 +216,7 @@ } else if( ! $has_cat ) { OpenTable() ; - echo _AM_ALRT_CATTABLENOTEXIST ; + echo _AM_APCAL_ALRT_CATTABLENOTEXIST ; echo " <br /> <form action='' method='post'> @@ -231,18 +231,18 @@ $rs_stz = $xoopsDB->query( "SELECT COUNT(*),server_tz FROM $table_event GROUP BY server_tz" ) ; OpenTable() ; echo " - ".sprintf(_AM_FMT_SERVER_TZ_ALL,date('Z',1104537600)/3600,date('Z',1120176000)/3600,date('T'),$xoopsConfig['server_TZ'],$cal->server_TZ)." + ".sprintf(_AM_APCAL_FMT_SERVER_TZ_ALL,date('Z',1104537600)/3600,date('Z',1120176000)/3600,date('T'),$xoopsConfig['server_TZ'],$cal->server_TZ)." <form action='' method='post'> <table border='1'> <tr> <th> - "._AM_TH_SERVER_TZ_COUNT." + "._AM_APCAL_TH_SERVER_TZ_COUNT." </th> <th> - "._AM_TH_SERVER_TZ_VALUE." + "._AM_APCAL_TH_SERVER_TZ_VALUE." </th> <th> - "._AM_TH_SERVER_TZ_VALUE_TO." + "._AM_APCAL_TH_SERVER_TZ_VALUE_TO." </th> </tr>\n" ; @@ -262,7 +262,7 @@ </td> </tr>\n" ; -/* printf( _AM_FMT_WRONGSTZ , $wrong_stzs ) ; +/* printf( _AM_APCAL_FMT_WRONGSTZ , $wrong_stzs ) ; echo " <br /> <input type='submit' name='repair_stz' value='"._GO."' /> @@ -275,12 +275,12 @@ if( $server_tz_wrong ) { echo " - <input type='submit' value='"._SUBMIT."' name='repair_stz' onclick='return confirm(\""._AM_JSALRT_SERVER_TZ."\");' /> + <input type='submit' value='"._SUBMIT."' name='repair_stz' onclick='return confirm(\""._AM_APCAL_JSALRT_SERVER_TZ."\");' /> ".$xoopsGTicket->getTicketHtml( __LINE__ )." </form>\n" ; - echo _AM_NOTICE_SERVER_TZ ; + echo _AM_APCAL_NOTICE_SERVER_TZ ; } else { - echo _AM_NOTICE_NOERRORS ; + echo _AM_APCAL_NOTICE_NOERRORS ; } CloseTable() ; } Modified: XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -40,29 +40,29 @@ //$form = new XoopsThemeForm($block['form_title'], 'blockform', XOOPS_URL."/modules/blocksadmin/admin/admin.php" ) ; $form = new XoopsThemeForm($block['form_title'], 'blockform', "admin.php" ) ; if (isset($block['name'])) { - $form->addElement(new XoopsFormLabel(_AM_NAME, $block['name'])); + $form->addElement(new XoopsFormLabel(_AM_APCAL_NAME, $block['name'])); } -$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']); -$side_select->addOptionArray(array(0 => _AM_SBLEFT, 1 => _AM_SBRIGHT, 3 => _AM_CBLEFT, 4 => _AM_CBRIGHT, 5 => _AM_CBCENTER, )); +$side_select = new XoopsFormSelect(_AM_APCAL_BLKTYPE, "bside", $block['side']); +$side_select->addOptionArray(array(0 => _AM_APCAL_SBLEFT, 1 => _AM_APCAL_SBRIGHT, 3 => _AM_APCAL_CBLEFT, 4 => _AM_APCAL_CBRIGHT, 5 => _AM_APCAL_CBCENTER, )); $form->addElement($side_select); -$form->addElement(new XoopsFormText(_AM_WEIGHT, "bweight", 2, 5, $block['weight'])); -$form->addElement(new XoopsFormRadioYN(_AM_VISIBLE, 'bvisible', $block['visible'])); -$mod_select = new XoopsFormSelect(_AM_VISIBLEIN, "bmodule", $block['modules'], 5, true); +$form->addElement(new XoopsFormText(_AM_APCAL_WEIGHT, "bweight", 2, 5, $block['weight'])); +$form->addElement(new XoopsFormRadioYN(_AM_APCAL_VISIBLE, 'bvisible', $block['visible'])); +$mod_select = new XoopsFormSelect(_AM_APCAL_VISIBLEIN, "bmodule", $block['modules'], 5, true); $module_handler =& xoops_gethandler('module'); $criteria = new CriteriaCompo(new Criteria('hasmain', 1)); $criteria->add(new Criteria('isactive', 1)); $module_list =& $module_handler->getList($criteria); -$module_list[-1] = _AM_TOPPAGE; -$module_list[0] = _AM_ALLPAGES; +$module_list[-1] = _AM_APCAL_TOPPAGE; +$module_list[0] = _AM_APCAL_ALLPAGES; ksort($module_list); $mod_select->addOptionArray($module_list); $form->addElement($mod_select); -$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false); +$form->addElement(new XoopsFormText(_AM_APCAL_TITLE, 'btitle', 50, 255, $block['title']), false); if ( $block['is_custom'] ) { // Custom Block's textarea - $notice_for_tags = '<span style="font-size:x-small;font-weight:bold;">'._AM_USEFULTAGS.'</span><br /><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>' ; + $notice_for_tags = '<span style="font-size:x-small;font-weight:bold;">'._AM_APCAL_USEFULTAGS.'</span><br /><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_APCAL_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>' ; $current_op = @$_GET['op'] == 'clone' ? 'clone' : 'edit' ; $uri_to_myself = XOOPS_URL . "/modules/blocksadmin/admin/admin.php?fct=blocksadmin&op=$current_op&bid={$block['bid']}" ; // $can_use_spaw = check_browser_can_use_spaw() ; @@ -73,12 +73,12 @@ ob_start() ; $sw = new SPAW_Wysiwyg( 'bcontent' , $block['content'] ) ; $sw->show() ; - $textarea = new XoopsFormLabel( _AM_CONTENT , ob_get_contents() ) ; + $textarea = new XoopsFormLabel( _AM_APCAL_CONTENT , ob_get_contents() ) ; $textarea->setDescription( $notice_for_tags . "<br /><br /><a href='$uri_to_myself&usespaw=0'>NORMAL</a>" ) ; ob_end_clean() ; } else { $myts =& MyTextSanitizer::getInstance(); - $textarea = new XoopsFormDhtmlTextArea(_AM_CONTENT, 'bcontent', $myts->htmlSpecialChars( $block['content'] ) , 15, 70); + $textarea = new XoopsFormDhtmlTextArea(_AM_APCAL_CONTENT, 'bcontent', $myts->htmlSpecialChars( $block['content'] ) , 15, 70); if( $can_use_spaw ) { $textarea->setDescription( $notice_for_tags . "<br /><br /><a href='$uri_to_myself&usespaw=1'>SPAW</a>" ) ; } else { @@ -87,27 +87,27 @@ } $form->addElement($textarea, true); - $ctype_select = new XoopsFormSelect(_AM_CTYPE, 'bctype', $block['ctype']); - $ctype_select->addOptionArray(array('H' => _AM_HTML, 'P' => _AM_PHP, 'S' => _AM_AFWSMILE, 'T' => _AM_AFNOSMILE)); + $ctype_select = new XoopsFormSelect(_AM_APCAL_CTYPE, 'bctype', $block['ctype']); + $ctype_select->addOptionArray(array('H' => _AM_APCAL_HTML, 'P' => _AM_APCAL_PHP, 'S' => _AM_APCAL_AFWSMILE, 'T' => _AM_APCAL_AFNOSMILE)); $form->addElement($ctype_select); } else { if ($block['template'] != '' && ! defined('XOOPS_ORETEKI') ) { $tplfile_handler =& xoops_gethandler('tplfile'); $btemplate =& $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']); if (count($btemplate) > 0) { - $form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate[0]->getVar('tpl_file').'&tpl_tplset='.htmlspecialchars($GLOBALS['xoopsConfig']['template_set'],ENT_QUOTES).'">'._AM_EDITTPL.'</a>')); + $form->addElement(new XoopsFormLabel(_AM_APCAL_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate[0]->getVar('tpl_file').'&tpl_tplset='.htmlspecialchars($GLOBALS['xoopsConfig']['template_set'],ENT_QUOTES).'">'._AM_APCAL_EDITTPL.'</a>')); } else { $btemplate2 =& $tplfile_handler->find('default', 'block', $block['bid']); if (count($btemplate2) > 0) { - $form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate2[0]->getVar('tpl_file').'&tpl_tplset=default">'._AM_EDITTPL.'</a>')); + $form->addElement(new XoopsFormLabel(_AM_APCAL_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate2[0]->getVar('tpl_file').'&tpl_tplset=default">'._AM_APCAL_EDITTPL.'</a>')); } } } if ($block['edit_form'] != false) { - $form->addElement(new XoopsFormLabel(_AM_OPTIONS, $block['edit_form'])); + $form->addElement(new XoopsFormLabel(_AM_APCAL_OPTIONS, $block['edit_form'])); } } -$cache_select = new XoopsFormSelect(_AM_BCACHETIME, 'bcachetime', $block['cachetime']); +$cache_select = new XoopsFormSelect(_AM_APCAL_BCACHETIME, 'bcachetime', $block['cachetime']); $cache_select->addOptionArray(array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH)); $form->addElement($cache_select); if (isset($block['bid'])) { Modified: XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -59,7 +59,7 @@ $group_defs = file( "$xoops_system_path/language/$language/admin/groups.php" ) ; foreach( $group_defs as $def ) { - if( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) eval( $def ) ; + if( strstr( $def , '_AM_APCAL_ACCESSRIGHTS' ) || strstr( $def , '_AM_APCAL_ACTIVERIGHTS' ) ) eval( $def ) ; } @@ -115,12 +115,12 @@ <form action='admin.php' name='blockadmin' method='post'> <table width='95%' class='outer' cellpadding='4' cellspacing='1'> <tr valign='middle'> - <th>"._AM_TITLE."</th> - <th align='center' nowrap='nowrap'>"._AM_SIDE."</th> - <th align='center'>"._AM_WEIGHT."</th> - <th align='center'>"._AM_VISIBLEIN."</th> - <th align='center'>"._AM_BCACHETIME."</th> - <th align='right'>"._AM_ACTION."</th> + <th>"._AM_APCAL_TITLE."</th> + <th align='center' nowrap='nowrap'>"._AM_APCAL_SIDE."</th> + <th align='center'>"._AM_APCAL_WEIGHT."</th> + <th align='center'>"._AM_APCAL_VISIBLEIN."</th> + <th align='center'>"._AM_APCAL_BCACHETIME."</th> + <th align='right'>"._AM_APCAL_ACTION."</th> </tr>\n" ; // blocks displaying loop @@ -185,8 +185,8 @@ $criteria = new CriteriaCompo(new Criteria('hasmain', 1)); $criteria->add(new Criteria('isactive', 1)); $module_list =& $module_handler->getList($criteria); - $module_list[-1] = _AM_TOPPAGE; - $module_list[0] = _AM_ALLPAGES; + $module_list[-1] = _AM_APCAL_TOPPAGE; + $module_list[0] = _AM_APCAL_ALLPAGES; ksort($module_list); $module_options = '' ; foreach( $module_list as $mid => $mname ) { @@ -316,10 +316,10 @@ $item_list[ $block_arr[$i]->getVar("bid") ] = $block_arr[$i]->getVar("title") ; } - $form = new MyXoopsGroupPermForm( _MD_AM_ADGS , 1 , 'block_read' , '' ) ; + $form = new MyXoopsGroupPermForm( _AM_APCAL_ADGS , 1 , 'block_read' , '' ) ; if( $target_mid > 1 ) { - $form->addAppendix( 'module_admin' , $target_mid , $target_mname . ' ' . _AM_ACTIVERIGHTS ) ; - $form->addAppendix( 'module_read' , $target_mid , $target_mname .' ' . _AM_ACCESSRIGHTS ) ; + $form->addAppendix( 'module_admin' , $target_mid , $target_mname . ' ' . _AM_APCAL_ACTIVERIGHTS ) ; + $form->addAppendix( 'module_read' , $target_mid , $target_mname .' ' . _AM_APCAL_ACCESSRIGHTS ) ; } foreach( $item_list as $item_id => $item_name) { $form->addItem( $item_id , $item_name ) ; @@ -335,7 +335,7 @@ } include( "mygroupperm.php" ) ; - redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/myblocksadmin.php$query4redirect" , 1 , _MD_AM_DBUPDATED ); + redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/myblocksadmin.php$query4redirect" , 1 , _MD_APCALAM_APCALDBUPDATED ); } xoops_cp_header() ; @@ -343,7 +343,7 @@ echo "<h3 style='text-align:left;'>$target_mname</h3>\n" ; if( ! empty( $block_arr ) ) { - echo "<h4 style='text-align:left;'>"._AM_BADMIN."</h4>\n" ; + echo "<h4 style='text-align:left;'>"._AM_APCAL_BADMIN."</h4>\n" ; list_blocks() ; } Modified: XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php =================================================================== --- XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php 2013-04-29 06:59:52 UTC (rev 11478) +++ XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php 2013-04-29 17:55:58 UTC (rev 11479) @@ -28,7 +28,7 @@ $group_defs = file( "$xoops_system_path/language/$language/admin/groups.php" ) ; foreach( $group_defs as $def ) { - if( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) eval( $def ) ; + if( strstr( $def , '_AM_APCAL_ACCESSRIGHTS' ) || strstr( $def , '_AM_APCAL_ACTIVERIGHTS' ) ) eval( $def ) ; } @@ -92,12 +92,12 @@ <form action='admin.php' name='blockadmin' method='post'> <table width='95%' class='outer' cellpadding='4' cellspacing='1'> <tr valign='middle'> - <th>"._AM_TITLE."</th> - <th align='center' nowrap='nowrap'>"._AM_SIDE."</th> - <th align='center'>"._AM_WEIGHT."</th> - <th align='center'>"._AM_VISIBLEIN."</th> - <th align='center'>"._AM_BCACHETIME."</th> - <th align='right'>"._AM_ACTION."</th> + <th>"._AM_APCAL_TITLE."</th> + <th align='center' nowrap='nowrap'>"._AM_APCAL_SIDE."</th> + <th align='center'>"._AM_APCAL_WEIGHT."</th> + <th align='center'>"._AM_APCAL_VISIBLEIN."</th> + <th align='center'>"._AM_APCAL_BCACHETIME."</th> + <th align='right'>"._AM_APCAL_ACTION."</th> </tr>\n" ; // get block instances @@ -108,16 +108,16 @@ $instances =& $instance_handler->getObjects($criteria, true, true); //Get modules and pages for visible in - $module_list[_AM_SYSTEMLEVEL]["0-2"] = _AM_ADMINBLOCK; - $module_list[_AM_SYSTEMLEVEL]["0-1"] = _AM_TOPPAGE; - $module_list[_AM_SYSTEMLEVEL]["0-0"] = _AM_ALLPAGES; + $module_list[_AM_APCAL_SYSTEMLEVEL]["0-2"] = _AM_APCAL_ADMINBLOCK; + $module_list[_AM_APCAL_SYSTEMLEVEL]["0-1"] = _AM_APCAL_TOPPAGE; + $module_list[_AM_APCAL_SYSTEMLEVEL]["0-0"] = _AM_APCAL_ALLPAGES; $criteria = new CriteriaCompo(new Criteria('hasmain', 1)); $criteria->add(new Criteria('isactive', 1)); $module_handler =& xoops_gethandler('module'); $module_main =& $module_handler->getObjects($criteria, true, true); if (count($module_main) > 0) { foreach (array_keys($module_main) as $mid) { - $module_list[$module_main[$mid]->getVar('name')][$mid."-0"] = _AM_ALLMODULEPAGES; + $module_list[$module_main[$mid]-... [truncated message content] |
From: <ant...@us...> - 2013-04-30 18:36:26
|
Revision: 11489 http://sourceforge.net/p/xoops/svn/11489 Author: antiquel Date: 2013-04-30 18:36:19 +0000 (Tue, 30 Apr 2013) Log Message: ----------- [ADD] APCal Version 2.2.0 is released. Modified Paths: -------------- XoopsModules/APCal/trunk/CHANGELOG.txt XoopsModules/APCal/trunk/INSTALL.txt XoopsModules/APCal/trunk/LANG DIFF.txt XoopsModules/APCal/trunk/LANG TRANS.txt XoopsModules/APCal/trunk/LICENCE.txt XoopsModules/APCal/trunk/README.txt XoopsModules/APCal/trunk/UPGRADE.txt Modified: XoopsModules/APCal/trunk/CHANGELOG.txt =================================================================== --- XoopsModules/APCal/trunk/CHANGELOG.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/CHANGELOG.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,7 +1,12 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> +Version 2.2.0 +- Fixed Timezones issue which was adding or removing days to an event. +- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. +- Updated All language files and variables to make the module clonable with SmartClone. + Version 2.1.3 - Fixed Events which need to be admitted don't create doubles of active events and an error message when clicked.. - Fixed All day events set on the first day of a month don't appear on everyday of the previous month. Modified: XoopsModules/APCal/trunk/INSTALL.txt =================================================================== --- XoopsModules/APCal/trunk/INSTALL.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/INSTALL.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,5 +1,5 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> INSTALL INSTRUCTIONS Modified: XoopsModules/APCal/trunk/LANG DIFF.txt =================================================================== --- XoopsModules/APCal/trunk/LANG DIFF.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/LANG DIFF.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,5 +1,5 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> Feel free to translate to your own language and send us your changes. Modified: XoopsModules/APCal/trunk/LANG TRANS.txt =================================================================== --- XoopsModules/APCal/trunk/LANG TRANS.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/LANG TRANS.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,5 +1,5 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> Modified: XoopsModules/APCal/trunk/LICENCE.txt =================================================================== --- XoopsModules/APCal/trunk/LICENCE.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/LICENCE.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,5 +1,5 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> GNU GENERAL PUBLIC LICENSE Modified: XoopsModules/APCal/trunk/README.txt =================================================================== --- XoopsModules/APCal/trunk/README.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/README.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,5 +1,5 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> MODULE DESCRIPTION Modified: XoopsModules/APCal/trunk/UPGRADE.txt =================================================================== --- XoopsModules/APCal/trunk/UPGRADE.txt 2013-04-30 18:25:56 UTC (rev 11488) +++ XoopsModules/APCal/trunk/UPGRADE.txt 2013-04-30 18:36:19 UTC (rev 11489) @@ -1,5 +1,5 @@ Module Name : APCal -Version Number : 2.1.3 +Version Number : 2.2.0 Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> UPGRADE FROM PICAL MODULE |
From: <be...@us...> - 2015-10-08 03:04:17
|
Revision: 13157 http://sourceforge.net/p/xoops/svn/13157 Author: beckmi Date: 2015-10-08 03:04:13 +0000 (Thu, 08 Oct 2015) Log Message: ----------- folder name change Added Paths: ----------- XoopsModules/APCal/trunk/modules/apcal/ XoopsModules/APCal/trunk/modules/apcal/docs/ XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt XoopsModules/APCal/trunk/modules/apcal/docs/LANG TRANS.txt XoopsModules/APCal/trunk/modules/apcal/docs/LICENCE.txt XoopsModules/APCal/trunk/modules/apcal/docs/README.txt XoopsModules/APCal/trunk/modules/apcal/docs/UPGRADE.txt Removed Paths: ------------- XoopsModules/APCal/trunk/CHANGELOG.txt XoopsModules/APCal/trunk/INSTALL.txt XoopsModules/APCal/trunk/LANG DIFF.txt XoopsModules/APCal/trunk/LANG TRANS.txt XoopsModules/APCal/trunk/LICENCE.txt XoopsModules/APCal/trunk/README.txt XoopsModules/APCal/trunk/UPGRADE.txt XoopsModules/APCal/trunk/modules/APCal/ Deleted: XoopsModules/APCal/trunk/CHANGELOG.txt =================================================================== --- XoopsModules/APCal/trunk/CHANGELOG.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/CHANGELOG.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,97 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -Version 2.2.0 -- Fixed Timezones issue which was adding or removing days to an event. -- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. -- Updated All language files and variables to make the module clonable with SmartClone. - -Version 2.1.3 -- Fixed Events which need to be admitted don't create doubles of active events and an error message when clicked.. -- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. - -Version 2.1.2 -- Fixed When inserting a new event, pictures are saved. -- Fixed The module now comes with its own datepicker because of some Xoops version bug. -- Fixed The map displays correclty when the contact is a user from the website. - -Version 2.1.1 -- Fixed When inserting a new event, pictures are saved. -- Updated Empty fields doesn't show in the event view. - -Version 2.1.0 -- Added Online registration feature with option to turn it on/off. (Uers can subscribe to an event and receive notifications for it) (Thanks to Goffy) -- Updated New way to make thumbs for better support on every servers. (Needs GD library) -- Updated When you save an event, the redirection is where you were before (Instead of current month) -- Fixed Links on events in the map for Yearly view and List view -- Fixed Some minor bug fixes -- New features are translated in English, French and German. - -Version 2.0.4 -- Updated Spanish and German translation. -- Fixed The link to add an event from the monthly view. - -Version 2.0.3 -- Minor bug fix on events insertion. -- The box in monthly view will not expand more than the screen width and height. - -Version 2.0.2 -- Fixed Shift for events in the first week of the month. -- Updated Language of social networks buttons in module language files. -- Updated Full event summary show in monthly view to take all available space. -- Updated In event view, event summary as title. - -Version 2.0.0 -- Updated Monthly view with linear view for one event (instead of repeating over and over) -- Added Possibility to Add Pictures to an event including a separate main picture. -- Added Thumbnail pictures with viewer in event view. -- Added Seperate field for website and e-mail. -- Added Optional main picture display in Monthly View (on mouse over), List View, Daily View and Weekly View. -- Added Each category have its own color. -- Added Legend of categories with categories colors. -- Added Possibility to choose which category to be used for an event (as we keep multi-category feature). -- Added Possibility to choose different hours for the same event (if multiple days are selected). -- Updated More neutral theme colors for images, should be a better fit with most website. -- Updated Reorganisation of admin preferences. -- Added Tell a friend feature. -- Added New sharing button (LindedIn and Delicious). -- Some minor bug fixes. - -Version 1.0.6 -- Added links to social networks (Facebook, Twitter, Google+) - -Version 1.0.5 -- Updated Admin menu to fit XOOPS 2.4 and 2.5. -- Some functions updates to fit php 5.3. - -Version 1.0.4 -- Updated admin menu. -- Fixed the bug caused by the .htaccess file generating an "Internal server error". -- Some minor bug fixes. - -Version 1.0.3 -- Some minor bug fixes. - -Version 1.0.2 -- Updated Google Optimization. -- Added onUpdate action to add the new DB fields. -- Updated onInstall action. -- Added navigation menu in event view and option to enable/disable it. -- Updated option to have bigger columns for every day (Select the ones bigger). -- Updated the "share this calendar" example to fit with Internet Explorer (IE7+) - -Version 1.0.1 -- Updated URLRewriting. -- Updated Google Optimization. - -Version 1.0.0 -- Added a map showing all events location. -- Added markers with number representing the date of event with next event first. -- Added individual map showing event location. -- Added optimization for Google. -- Added possibility to add a description in HTML for each categories. -- Added an API that allows webmasters to show easily your calendar on their website (linking back to your site). -- Updated customizable theme. -- Added option for bigger columns for week-ends. -- Updated calendar of holidays for United States, Canada and France. \ No newline at end of file Deleted: XoopsModules/APCal/trunk/INSTALL.txt =================================================================== --- XoopsModules/APCal/trunk/INSTALL.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/INSTALL.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,9 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -INSTALL INSTRUCTIONS -1. Upload the APCal directory to XOOPS_URL/modules/ -2. Log in to your site as administrator. -3. Install the module using the XOOPS module administration panel at 'System Admin Modules'. - If you already have the piCal module, all your categories and events will be automatically transfered. \ No newline at end of file Deleted: XoopsModules/APCal/trunk/LANG DIFF.txt =================================================================== --- XoopsModules/APCal/trunk/LANG DIFF.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/LANG DIFF.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,244 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -Feel free to translate to your own language and send us your changes. - -Done for: -up to v2.1.0: English, French, German -up to v2.0.4: English, French, German, Spanish -before v1.0.0: English, French, German, Spanish, Japanese, Dutch, Russian, Tchinese, Swedish, Portuguese, BrasilPortuguese - - -Version 2.1.0 -- modinfo.php - - added _MI_APCAL_ENABLEREGISTRATION -- apcal_constants.php - - added _APCAL_RO_CANCEL - - added _APCAL_RO_RADIO_YES - - added _APCAL_RO_RADIO_NO - - added _APCAL_RO_ONLINE_POSS - - added _APCAL_RO_ONLINE_POSS_2 - - added _APCAL_RO_ONLY_MEMBERS - - added _APCAL_RO_ONLINE_NO - - added _APCAL_RO_ONLINE_YES - - added _APCAL_RO_ONLINE_ACTIVATE - - added _APCAL_RO_ONLINE_DEACTIVATE - - added _APCAL_RO_ONLINE - - added _APCAL_RO_BTN_ADD - - added _APCAL_RO_BTN_ADDMORE - - added _APCAL_RO_BTN_REMOVE - - added _APCAL_RO_ENABLE_ONLINE - - added _APCAL_RO_NOMEMBERS - - added _APCAL_RO_BTN_LISTMEMBERS - - added _APCAL_RO_SUCCESS_ADD - - added _APCAL_RO_SUCCESS_REMOVE - - added _APCAL_RO_UNAME - - added _APCAL_RO_FIRSTNAME - - added _APCAL_RO_LASTNAME - - added _APCAL_RO_EMAIL - - added _APCAL_RO_EXTRAINFO1 - - added _APCAL_RO_EXTRAINFO2 - - added _APCAL_RO_EXTRAINFO3 - - added _APCAL_RO_EXTRAINFO4 - - added _APCAL_RO_EXTRAINFO5 - - added _APCAL_RO_BTN_CONF_ADD - - added _APCAL_RO_BTN_CONF_ADD_MORE - - added _APCAL_RO_BTN_CONF_REMOVE - - added _APCAL_RO_BTN_CANCEL - - added _APCAL_RO_EVENT - - added _APCAL_RO_TITLE1 - - added _APCAL_RO_OBLIGATORY - - added _APCAL_RO_ERROR_REMOVE - - added _APCAL_RO_ERROR_ADD - - added _APCAL_RO_BTN_BACK - - added _APCAL_RO_BACK - - added _APCAL_RO_ONLINE2 - - added _APCAL_RO_ACTION - - added _APCAL_RO_TITLE2 - - added _APCAL_RO_BTN_RO_EDIT - - added _APCAL_RO_BTN_RO_DEACTIVATE - - added _APCAL_RO_BTN_RO_ACTIVATE - - added _APCAL_RO_QUANTITY - - added _APCAL_RO_QUANTITY2 - - added _APCAL_RO_DATELIMIT - - added _APCAL_RO_EMAIL_NOTIFY - - added _APCAL_RO_BTN_CONF_ACTIVATE - - added _APCAL_RO_ERROR_RO_ACTIVATE - - added _APCAL_RO_SUCCESS_RO_ACTIVATE - - added _APCAL_RO_ERROR_RO_DEACTIVATE - - added _APCAL_RO_SUCCESS_RO_DEACTIVATE - - added _APCAL_RO_ERROR_FULL - - added _APCAL_RO_ERROR_TIMEOUT - - added _APCAL_RO_ERROR_OBLIGATORY - - added _APCAL_RO_BTN_CONF_SAVE - - added _APCAL_RO_BTN_CONF_EDIT - - added _APCAL_RO_MAIL_SUBJ_ADD - - added _APCAL_RO_MAIL_SUBJ_REMOVE - - added _APCAL_RO_MAIL_SUBJ_TEXT - - added _APCAL_RO_DATE - - added _APCAL_RO_LOCATION - - added _APCAL_RO_LINK - - added _APCAL_RO_TITLE3 - - added _APCAL_RO_TITLE4 - - added _APCAL_RO_MAIL_SENDER - - added _APCAL_RO_MAIL_SUBJ - - added _APCAL_RO_MAIL_BODY1 - - added _APCAL_RO_MAIL_BODY2 - - added _APCAL_RO_BTN_SEND - - added _APCAL_RO_MAILSENT - - added _APCAL_RO_TITLE5 - - added _APCAL_RO_BTN_EDIT - - added _APCAL_RO_SUCCESS_EDIT - - added _APCAL_RO_ERROR_EDIT - - added _APCAL_RO_SEND_CONF1 - - added _APCAL_RO_SEND_CONF2 - - added _APCAL_RO_SEND_CONF3 - - added _APCAL_RO_REDIRECT - - added _APCAL_RO_SUCCESS_NEW_EVENT - - added _APCAL_RO_SUCCESS_DELETE_EVENT - - added _APCAL_RO_SUCCESS_UPDATE_EVENT - - added _APCAL_RO_SUCCESS_COPY_EVENT - -Version 2.0.4 -- main.php - - added _APCAL_FB_LNG - - added _APCAL_GPLUS_LNG - -Version 2.0.0 -- modinfo.php - - updated _MI_APCAL_DISPLAYCATTITLE - - added _MI_APCAL_ENABLESOCIAL - - added _MI_APCAL_NBPICS - - added _MI_APCAL_PICSWIDTH - - added _MI_APCAL_PICSHEIGHT - - added _MI_APCAL_SHOWPICMONTHLY - - added _MI_APCAL_SHOWPICWEEKLY - - added _MI_APCAL_SHOWPICDAILY - - added _MI_APCAL_SHOWPICLIST - - added _MI_APCAL_EVENTBGCOLOR - - added _MI_APCAL_EVENTCOLOR - - added _MI_APCAL_ALLCATSCOLOR - - added _MI_APCAL_DISPLAYTIMEZONE - - added _MI_APCAL_USERS - - added _MI_APCAL_COLORS - - added _MI_APCAL_SETTINGS - - added _MI_APCAL_CALSETTINGS - - added _MI_APCAL_CALDISPLAY - - added _MI_APCAL_EVENTS - - added _MI_APCAL_PICTURES - - added _MI_APCAL_MAP - - added _MI_APCAL_COMMENTSNOT - - updated _MI_APCAL_THMORDEFAULTDESC - - added _MI_APCAL_OPT_DEFAULT - - added _MI_APCAL_OPT_NONE - - added _MI_APCAL_SUNDAY - - added _MI_APCAL_MONDAY - - added _MI_APCAL_TUESDAY - - added _MI_APCAL_WEDNESDAY - - added _MI_APCAL_THURSDAY - - added _MI_APCAL_FRIDAY - - added _MI_APCAL_SATURDAY -- main.php - - added _APCAL_TH_EMAIL - - added _APCAL_TH_URL - - added _APCAL_MAINPICTURE - - added _APCAL_PICTURES - - added _APCAL_TH_MAINCATEGORY - - added _APCAL_NONE - - added _APCAL_DAY - - added _APCAL_DIFFERENTHOURS - - added _APCAL_SAMEHOURS - - added _APCAL_CLICKFORDETAILS - - added _APCAL_BEGIN - - added _APCAL_END - - added _APCAL_LOCATION - - added _APCAL_TELLAFRIEND - - added _APCAL_FROM - - added _APCAL_TO - - added _APCAL_SUBJECT - - added _APCAL_MESSAGE - - added _APCAL_TELLAFRIENDTEXT -- admin.php - - added _AM_APCAL_PREFS - - added _AM_APCAL_UPDATE - - added _AM_APCAL_BLOCKS - - added _AM_APCAL_GOTOMODULE - - added _AM_APCAL_CANBEMAIN - - added _AM_APCAL_COLOR - - -Version 1.0.5 -- modinfo.php - - added _MI_APCAL_BNAME_MAP - - added _MI_APCAL_BNAME_MAP_DESC - - added _APCAL_TH_GETCOORDS - - added _APCAL_TH_LATITUDE - - added _APCAL_TH_LONGITUDE - - added _APCAL_TH_ZOOM - - added _APCAL_PROVIDEDBY - - added _APCAL_X - - added _APCAL_AP - - added _APCAL_CALENDAROF - - added _APCAL_SHARECALENDARFORM - - added _APCAL_SHOWALLCAT - - added _APCAL_GENERATE - - added _APCAL_GENERATEHINT - - added _APCAL_CATEGORIES - - added _APCAL_NBEVENTS - - added _APCAL_WIDTH - - added _APCAL_STYLE - - added _APCAL_IFCUSTOM - - added _APCAL_BORDER - - added _APCAL_TITLE - - added _APCAL_TEXT - - added _APCAL_LINK - - added _APCAL_EVEN - - added _APCAL_ODD - - added _APCAL_DEFAULT - - added _APCAL_CUSTOM - - added _APCAL_THEME - - added _APCAL_SHAREINFO - - added _APCAL_SHARECALENDAR - - added _APCAL_PREVEVENT - - added _APCAL_NEXTEVENT - - added _APCAL_BACKTOCAL - - added _MI_APCAL_INDEX -- main.php - - added _APCAL_APURL - - added _APCAL_APURL2 - - added _MI_APCAL_GMLAT - - added _MI_APCAL_GMLNG - - added _MI_APCAL_GMZOOM - - added _MI_APCAL_GMHEIGHT - - added _MI_APCAL_USEURLREWRITE - - added _MI_APCAL_DESCUSEURLREWRITE - - added _MI_APCAL_WIDERWEEKEND - - added _MI_APCAL_WIDERWEEKENDDESC - - added _MI_APCAL_GETTHMCOLOR - - added _MI_APCAL_OPT_THM - - added _MI_APCAL_OPT_CUSTOM - - added _MI_APCAL_THMORDEFAULT - - added _MI_APCAL_THMORDEFAULTDESC - - added _MI_APCAL_ENABLECALMAP - - added _MI_APCAL_ENABLEEVENTMAP - - added _MI_APCAL_ENABLESHARING - - added _MI_APCAL_EVENTNAVENABLED - - added _MI_APCAL_DISPLAYCATTITLE -- admin.php - - added _AM_APCAL_TIMEZONE - - added _AM_APCAL_MODULEADMIN_CONFIG - - added _AM_APCAL_NBWAITINGEVENTS - - added _AM_APCAL_NBEVENTS - - added _AM_APCAL_NBCATS - - added _AM_APCAL_MODULEADMIN_CONFIG_PHP - - added _AM_APCAL_MODULEADMIN_CONFIG_XOOPS - - added _AM_APCAL_TITLE - - added _AM_APCAL_SIDE - - added _AM_APCAL_WEIGHT - - added _AM_APCAL_VISIBLEIN - - added _AM_APCAL_BCACHETIME - - added _AM_APCAL_ACTION - - added _AM_APCAL_ACTIVERIGHTS - - added _AM_APCAL_ACCESSRIGHTS - - added _AM_APCAL_BADMIN \ No newline at end of file Deleted: XoopsModules/APCal/trunk/LANG TRANS.txt =================================================================== --- XoopsModules/APCal/trunk/LANG TRANS.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/LANG TRANS.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,273 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - - -modinfo.php (line 35) -define("_MI_APCAL_BNAME_MAP", 'Map of events for this month'); -define("_MI_APCAL_BNAME_MAP_DESC", ''); - -modinfo.php (line 73) -define("_MI_APCAL_GMLAT" , "\"Google Map\" default latitude" ) ; -define("_MI_APCAL_GMLNG" , "\"Google Map\" default longitude" ) ; -define("_MI_APCAL_GMZOOM" , "\"Google Map\" default zoom level" ) ; -define("_MI_APCAL_GMHEIGHT" , "\"Google Map\" height (in pixels)" ) ; -define("_MI_APCAL_USEURLREWRITE" , "Use URL rewriting" ) ; -define("_MI_APCAL_WIDERWEEKEND" , "Wider columns in month view for:" ) ; -define('_MI_APCAL_GETTHMCOLOR', 'Main css filename in your theme folder'); -define('_MI_APCAL_THMORDEFAULT', 'Colors from:'); -define('_MI_APCAL_ENABLECALMAP', 'Show google map in calendar view'); -define('_MI_APCAL_ENABLEEVENTMAP', 'Show google map in event view'); -define('_MI_APCAL_ENABLESHARING', 'Enable users to share your calendar on their website'); -define('_MI_APCAL_EVENTNAVENABLED', 'Enable navigation menu in event view'); -define('_MI_APCAL_DISPLAYCATTITLE', 'Display category tilte as module page title'); -define('_MI_APCAL_ENABLESOCIAL', 'Enable social networks links'); -define('_MI_APCAL_NBPICS', 'Maximum number of pictures allowed (0 if you don\'t want any)'); -define('_MI_APCAL_PICSWIDTH', 'Maximum width of pictures for display in event view'); -define('_MI_APCAL_PICSHEIGHT', 'Maximum height of pictures for display in event view'); -define('_MI_APCAL_SHOWPICMONTHLY', 'Show main picture in monthly view'); -define('_MI_APCAL_SHOWPICWEEKLY', 'Show main picture in weekly view'); -define('_MI_APCAL_SHOWPICDAILY', 'Show main picture in daily view'); -define('_MI_APCAL_SHOWPICLIST', 'Show main picture in list view'); -define('_MI_APCAL_EVENTBGCOLOR', ' Bgcolor of event\'s row'); -define('_MI_APCAL_EVENTCOLOR', 'Color of event\'s row'); -define('_MI_APCAL_ALLCATSCOLOR', 'Color for the default category'); -define('_MI_APCAL_DISPLAYTIMEZONE', 'Display Timezone when showing time'); -define('_MI_APCAL_ICSNEWCAL', 'Create a new calendar for ical exportation'); -define('_MI_APCAL_ENABLEREGISTRATION', 'Enable online registration'); - -modinfo.php (line 101) -define('_MI_APCAL_USERS', 'Users'); -define('_MI_APCAL_COLORS', 'Colors'); -define('_MI_APCAL_SETTINGS', 'General Settings'); -define('_MI_APCAL_CALSETTINGS', 'Calendar Settings'); -define('_MI_APCAL_CALDISPLAY', 'Calendar Display'); -define('_MI_APCAL_EVENTS', 'Events'); -define('_MI_APCAL_PICTURES', 'Pictures'); -define('_MI_APCAL_MAP', 'Google Map'); -define('_MI_APCAL_COMMENTSNOT', 'Comments & Notifications'); - -modinfo.php (line 115) -define("_MI_APCAL_DESCUSEURLREWRITE" , "<b>In order to make it works, copy /modules/APCal/doc/.htaccess to /modules/APCal/.</b><br /><br />N.B.: If you don't have the apache \"mod_rewrite\" installed on your server, it might not work. Please contact your system admin for details." ) ; -define("_MI_APCAL_WIDERWEEKENDDESC" , "Hold down the \"Ctrl\" key on your keyboard while you click to select more than one day." ); -define('_MI_APCAL_THMORDEFAULTDESC', 'Theme: Give your main css filename in the next field. (Recommended)<br />Custom: Fill up the next 13 fields.<br />Default: Use the default colors.'); - -modinfo.php (line 140) -define('_MI_APCAL_OPT_THM', 'Theme'); -define('_MI_APCAL_OPT_CUSTOM', 'Custom'); -define('_MI_APCAL_OPT_DEFAULT', 'Default'); -define("_MI_APCAL_OPT_NONE", "None"); -define('_MI_APCAL_SUNDAY', 'Sunday'); -define('_MI_APCAL_MONDAY', 'Monday'); -define('_MI_APCAL_TUESDAY', 'Tuesday'); -define('_MI_APCAL_WEDNESDAY', 'Wednesday'); -define('_MI_APCAL_THURSDAY', 'Thursday'); -define('_MI_APCAL_FRIDAY', 'Friday'); -define('_MI_APCAL_SATURDAY', 'Saturday'); - -modinfo.php (line 153) -define('_MI_APCAL_INDEX', 'Index'); - - -main.php (line 9) -define('_APCAL_APURL', 'http://xoops.antiquespromotion.ca'); -define('_APCAL_APURL2', 'http://www.antiquespromotion.ca'); - -main.php (line 20) -// edit event -define('_APCAL_TH_GETCOORDS', 'Find position'); -define('_APCAL_TH_LATITUDE', 'Latitude'); -define('_APCAL_TH_LONGITUDE', 'Longitude'); -define('_APCAL_TH_ZOOM', 'Zoom level'); -define('_APCAL_TH_EMAIL', 'Email'); -define('_APCAL_TH_URL', 'URL'); -define('_APCAL_MAINPICTURE', 'Main picture'); -define('_APCAL_PICTURES', 'Other pictures'); -define('_APCAL_TH_MAINCATEGORY', 'Main Category'); -define('_APCAL_NONE', 'None'); -define('_APCAL_DAY', 'Day'); -define('_APCAL_DIFFERENTHOURS', 'Different hours for each days'); -define('_APCAL_SAMEHOURS', 'Use same hours for each day'); - -main.php (line 35) -// API texts -define('_APCAL_PROVIDEDBY', 'Results provided by'); -define('_APCAL_X', 'by'); -define('_APCAL_AP', 'Antiques Promotion Canada'); -define('_APCAL_CALENDAROF', 'Calendar of'); - -main.php (line 41) -// Share admin -define('_APCAL_SHARECALENDARFORM', 'Fill up that form to show the calendar on your website.'); -define('_APCAL_SHOWALLCAT', 'All categories'); -define('_APCAL_GENERATE', 'Generate'); -define('_APCAL_GENERATEHINT', 'You might have to click generate two times on certain browsers.'); -define('_APCAL_CATEGORIES', 'categories'); -define('_APCAL_NBEVENTS', 'Number of events displayed'); -define('_APCAL_WIDTH', 'Block width'); -define('_APCAL_STYLE', 'Style and colors'); -define('_APCAL_IFCUSTOM', 'If you chose "custom", fill the section below (in CSS).'); -define('_APCAL_BORDER', 'Block border'); -define('_APCAL_TITLE', 'Calendar title'); -define('_APCAL_TEXT', 'Calendar text'); -define('_APCAL_LINK', 'Event links'); -define('_APCAL_EVEN', 'Even rows'); -define('_APCAL_ODD', 'Odd rows'); -define('_APCAL_DEFAULT', 'Default'); -define('_APCAL_CUSTOM', 'Custom'); -define('_APCAL_THEME', 'From your theme'); -define('_APCAL_SHAREINFO', 'In order to display the calendar on your website, you must copy & paste this HTML code on your desired webpage.'); -define('_APCAL_SHARECALENDAR', 'Display this calendar on your website'); - -main.php (line 63) -// Event view -define('_APCAL_PREVEVENT', 'Previous event'); -define('_APCAL_NEXTEVENT', 'Next event'); -define('_APCAL_BACKTOCAL', 'Back to calendar'); - -main.php (line 68) -// Tooltip -define('_APCAL_CLICKFORDETAILS', 'Click to open event'); -define('_APCAL_BEGIN', 'From'); -define('_APCAL_END', 'To'); -define('_APCAL_LOCATION', 'Location'); - -main.php (line 74) -// Tell a friend -define('_APCAL_TELLAFRIEND', 'Tell a friend'); -define('_APCAL_FROM', 'From'); -define('_APCAL_TO', 'To'); -define('_APCAL_SUBJECT', 'Subject'); -define('_APCAL_MESSAGE', 'Message'); -define('_APCAL_TELLAFRIENDTEXT', 'You should visit this fabulous calendar at'); - -main.php (line 82) -// Share -define('_APCAL_FB_LNG', 'en_US'); -define('_APCAL_GPLUS_LNG', 'en'); - - -admin.php (line 8) -// Index -define('_AM_APCAL_TIMEZONE', 'Timezones'); -define('_AM_APCAL_MODULEADMIN_CONFIG', 'Configurations'); -define('_AM_APCAL_NBWAITINGEVENTS', 'There are %s events waiting for approval.'); -define('_AM_APCAL_NBEVENTS', 'There are %s upcomming events.'); -define('_AM_APCAL_NBCATS', 'There are %s categories.'); -define('_AM_APCAL_MODULEADMIN_CONFIG_PHP', 'You must have at least php version %s (your current version is %s)'); -define('_AM_APCAL_MODULEADMIN_CONFIG_XOOPS', 'You must have at least xoops version %s (your current version is %s)'); -define('_AM_APCAL_PREFS', 'Preferences'); -define('_AM_APCAL_UPDATE', 'Update'); -define('_AM_APCAL_BLOCKS', 'Blocks'); -define('_AM_APCAL_GOTOMODULE', 'Go to module'); - -admin.php (line 125) -define('_AM_APCAL_CANBEMAIN', 'Can be a main category'); -define('_AM_APCAL_COLOR', 'Color'); - -admin.php (line 145) -// Blocks & Groups Admin -define('_AM_APCAL_TITLE', 'Title'); -define('_AM_APCAL_SIDE', 'Location'); -define('_AM_APCAL_WEIGHT', 'Weight'); -define('_AM_APCAL_VISIBLEIN', 'Visible in'); -define('_AM_APCAL_BCACHETIME', 'Cache time'); -define('_AM_APCAL_ACTION', 'Action'); -define('_AM_APCAL_ACTIVERIGHTS', 'Module administration rights'); -define('_AM_APCAL_ACCESSRIGHTS', 'Module access rights'); -define('_AM_APCAL_BADMIN', 'Blocks administration'); - - -apcal_constants.php (line 178) -define('_APCAL_RO_CANCEL','Action canceled'); -define('_APCAL_RO_RADIO_YES','Yes'); -define('_APCAL_RO_RADIO_NO','No'); - -define('_APCAL_RO_ONLINE_POSS','For these events online registration is possible. '); -define('_APCAL_RO_ONLINE_POSS_2','For this event online registration is possible. '); -define('_APCAL_RO_ONLY_MEMBERS','Online registration is only possible for registrated users. '); -define('_APCAL_RO_ONLINE_NO','Online registration is not activated for this event'); -define('_APCAL_RO_ONLINE_YES','Online registration is activated for this event'); -define('_APCAL_RO_ONLINE_ACTIVATE','Activate online registration for this event'); -define('_APCAL_RO_ONLINE_DEACTIVATE','Do not use online registration for this event'); -define('_APCAL_RO_ONLINE','Registrations'); -define('_APCAL_RO_BTN_ADD','registrate'); -define('_APCAL_RO_BTN_ADDMORE','Edit or add further registrations'); -define('_APCAL_RO_BTN_REMOVE','deregistrate'); -define('_APCAL_RO_ENABLE_ONLINE','Online registration'); -define('_APCAL_RO_NOMEMBERS','There are no registrations for this event'); -define('_APCAL_RO_BTN_LISTMEMBERS','List of participants'); -define('_APCAL_RO_SUCCESS_ADD','The registration for this event was successful'); -define('_APCAL_RO_SUCCESS_REMOVE','The de-registration for this event was successful'); -define('_APCAL_RO_UNAME','Registrating person'); -define('_APCAL_RO_FIRSTNAME','first name'); -define('_APCAL_RO_LASTNAME','last name'); -define('_APCAL_RO_EMAIL','E-mail-address'); -define('_APCAL_RO_EXTRAINFO1','Telephone'); //use it as you want; if you keep it blank, it will be invisible; if you change later, it has no effect on the data himself -define('_APCAL_RO_EXTRAINFO2','Remarks'); //use it as you want, if you keep it blank, it will be invisible -define('_APCAL_RO_EXTRAINFO3',''); //use it as you want, if you keep it blank, it will be invisible -define('_APCAL_RO_EXTRAINFO4',''); //use it as you want, if you keep it blank, it will be invisible -define('_APCAL_RO_EXTRAINFO5',''); //use it as you want, if you keep it blank, it will be invisible - -define('_APCAL_RO_BTN_CONF_ADD','Confirm registration'); -define('_APCAL_RO_BTN_CONF_ADD_MORE','Confirm registration and registrate further persons'); -define('_APCAL_RO_BTN_CONF_REMOVE','Confirm de-registration'); -define('_APCAL_RO_BTN_CANCEL','Cancel'); -define('_APCAL_RO_EVENT','Event'); -define('_APCAL_RO_TITLE1','Registration for an event'); -define('_APCAL_RO_OBLIGATORY','This fields are obligatory!'); - -define('_APCAL_RO_ERROR_REMOVE','Unexepted error when deleting registration'); -define('_APCAL_RO_ERROR_ADD','Unexepted error when creating registration'); -define('_APCAL_RO_BTN_BACK','Go back'); -define('_APCAL_RO_BACK','You will be redirected to last page'); -define('_APCAL_RO_ONLINE2','Online registrations'); -define('_APCAL_RO_ACTION','Action'); - -define('_APCAL_RO_TITLE2','Activate online registration for this event'); -define('_APCAL_RO_BTN_RO_EDIT','Edit online registration'); -define('_APCAL_RO_BTN_RO_DEACTIVATE','Delete online registration'); -define('_APCAL_RO_BTN_RO_ACTIVATE','Activate'); -define('_APCAL_RO_QUANTITY','Maximum number of participants<br/>(0 means: no limit)'); -define('_APCAL_RO_QUANTITY2','Maximum number of participants'); -define('_APCAL_RO_DATELIMIT','Deadline for online registration'); -define('_APCAL_RO_EMAIL_NOTIFY','E-mail-address, which should be notified in case of (de-)registrations (keep blank, if you want no notifications)'); -define('_APCAL_RO_BTN_CONF_ACTIVATE','Confirm'); -define('_APCAL_RO_ERROR_RO_ACTIVATE','Unexpected error while activating online registration'); -define('_APCAL_RO_SUCCESS_RO_ACTIVATE','Activating/editing online registration was successful'); -define('_APCAL_RO_ERROR_RO_DEACTIVATE','Unexpected error while deactivating online registration'); -define('_APCAL_RO_SUCCESS_RO_DEACTIVATE','Deactivating online registration was successful'); -define('_APCAL_RO_ERROR_FULL','Sorry, but there are no more places available for this event'); -define('_APCAL_RO_ERROR_TIMEOUT','Sorry, but you have exceeded the deadline of this event'); -define('_APCAL_RO_ERROR_OBLIGATORY','Please fill in obligatory field \"%f\"'); -define('_APCAL_RO_BTN_CONF_SAVE','Save'); -define('_APCAL_RO_BTN_CONF_EDIT','Save changes'); - -define('_APCAL_RO_MAIL_SUBJ_ADD','Info registration'); -define('_APCAL_RO_MAIL_SUBJ_REMOVE','Info de-registration'); -define('_APCAL_RO_MAIL_SUBJ_TEXT','Information about the event'); -define('_APCAL_RO_DATE','Date'); -define('_APCAL_RO_LOCATION','Location'); -define('_APCAL_RO_LINK','Link to event'); -define('_APCAL_RO_TITLE3','List of existing registrations'); -define('_APCAL_RO_TITLE4','Send an email to all participant, which have entered an email-address'); -define('_APCAL_RO_MAIL_SENDER','Sender'); -define('_APCAL_RO_MAIL_SUBJ','Subject'); -define('_APCAL_RO_MAIL_BODY1','Mailtext'); -define('_APCAL_RO_MAIL_BODY2','The expressions in curly brackets will be replaced (z.B. {NAME} will be replace by first name and last name)'); -define('_APCAL_RO_BTN_SEND','Send'); -define('_APCAL_RO_MAILSENT',' message(s) sent'); - -define('_APCAL_RO_TITLE5','Change registrations'); -define('_APCAL_RO_BTN_EDIT','Edit'); -define('_APCAL_RO_SUCCESS_EDIT','Change of registration data successful'); -define('_APCAL_RO_ERROR_EDIT','Unexpected error while changing registration'); -define('_APCAL_RO_SEND_CONF1','E-Mail confirmation'); -define('_APCAL_RO_SEND_CONF2','send to'); -define('_APCAL_RO_SEND_CONF3','Send E-Mail-confirmation: '); - -define('_APCAL_RO_REDIRECT','You will be redirected to activation of online registration'); -define('_APCAL_RO_SUCCESS_NEW_EVENT','Event succesfully created'); -define('_APCAL_RO_SUCCESS_DELETE_EVENT','Event succesfully deleted'); -define('_APCAL_RO_SUCCESS_UPDATE_EVENT','Event succesfully changed'); -define('_APCAL_RO_SUCCESS_COPY_EVENT','Event succesfully copied'); \ No newline at end of file Deleted: XoopsModules/APCal/trunk/LICENCE.txt =================================================================== --- XoopsModules/APCal/trunk/LICENCE.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/LICENCE.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,284 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS Deleted: XoopsModules/APCal/trunk/README.txt =================================================================== --- XoopsModules/APCal/trunk/README.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/README.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,100 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -MODULE DESCRIPTION -APCal is a powerful calendar module for Xoops. - -There is no update since 2006 on the piCal module and the developer doesn't seem to work on it, -so we decided to upgrade it. - -NEW FEATURES: -- Some bug fixes. See CHANGELOG.txt for details. - -ORIGINAL FEATURES: -- User Registration (Thanks to Goffy) - - Users can subcribe to events and receive notifications. - - Manage wich events can take subscriptions. - - Option: Turn it on and off. - - Option: Set the maximum number of subscribers. - - Option: Set the deadline to subscribe. -- Pictures - - Thumbnail pictures with viewer in event view. - - Option : Add pictures to an event including a separated main picture. - - Option : Main picture display in Monthly View (on mouse over), List View, Daily View and Weekly View. -- Monthly view - - Monthly view with linear view for one event. (instead of repeating over and over) - - Each category have its own color. - - Legend of categories with categories colors. - - Option : bigger columns for chosen days. -- Display - - Seperate field for website and e-mail. - - More neutral colors for theme images, should be a better fit with most website. - - Reorganisation of admin preferences. - - Improved customizable theme. -- Sharing - - Tell a friend feature. - - New sharing buttons (LindedIn and Delicious). - - Option : display the share this calendar link. - - Option : API that allows webmasters to show easily your calendar on their website (linking back to your site). -- Map - - Markers with number representing the date of event with next event first. - - Option : Enable/disable map showing all events location. - - Option : Individual map showing event location. -- SEO - - Optimised for Google (Title and Description). - - Option : URL Rewrite if allowed by server. - - Option : Add a description in HTML for each categories. - - Option : Display title of categories in H1. -- Events - - Empty fields doesn't display in the event view. - - Option : Choose which category will be used for an event (as we keep multi-category feature). - - Option : Choose different hours for the same event (if multiple days are selected). - - Option : Navigation menu to see previous and next event. - -- Option : Perpetual holidays for USA (En), Canada (En), Quebec (Fr), France (Fr). - - -ORIGINAL PICAL FEATURES -- 4 Different views (Daily, Weekly, Monthly, Yearly). -- Users can add events if permission is granted. -- Export to ICS format. - -LICENSE -This module is released under the GPL license. See LICENSE.txt for details. - -LANGUAGES -up to v2.1.1: English, French, German -up to v2.0.4: English, French, German, Spanish -before v1.0.0: English, French, German, Spanish, Japanese, Dutch, Russian, Tchinese, Swedish, Portuguese, BrasilPortuguese - -CREDITS -This module is based on piCal, originally developed by GIJ=CHECKMATE <gi...@pe...>. -Sources created by Antiques Promotion, Goffy, GIJ=CHECKMATE, Ryuji. -Templates created by Antiques Promotion, GIJ=CHECKMATE. -Documentation by Antiques Promotion. -Testing by Antiques Promotion. -Translation by: - Antiques Promotion English (up to v2.1.1) - Antiques Promotion French (up to v2.1.1) - Goffy German (up to v2.1.1) - marpe Spanish (up to v2.0.4) - Chimpel Nederlands (before v1.0.0) - FrenchmaN Russian (before v1.0.0) - Xoobs TChinese (before v1.0.0) - Leif Madsen Swedish (before v1.0.0) - Olivier Portuguese (before v1.0.0) - Marcelo Yuji Himoro Brasil Portuguese (before v1.0.0) - Cubiq Italian (before v1.0.0) - kurak_bu Polish (before v1.0.0) - -REFERENCES -phpicalendar http://phpicalendar.sourceforge.net -PiCal http://xoops.peak.ne.jp - -FEEDBACK -For any suggestions, comments, bug reports and feature requests visit the development site at: http://xoops.antiquespromotion.ca - -FAQ -Q) The Displayed time is different from the time input time -A) This is caused the wrong setting of Time Zones in your XOOPS. Check Time Zones of your account, default account, or server. \ No newline at end of file Deleted: XoopsModules/APCal/trunk/UPGRADE.txt =================================================================== --- XoopsModules/APCal/trunk/UPGRADE.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/UPGRADE.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,20 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -UPGRADE FROM PICAL MODULE -1. Upload all files in this package to XOOPS_URL/modules/APCal/ -2. Log in to your site as administrator. -3. Install the module using the XOOPS module administration panel at 'System Admin Modules'. - All your piCal categories and events will be transfered to APCal module. - -P.S.: Before upgrading, we recommend you to backup your database. - -================================================================================== - -UPGRADE INSTRUCTIONS -1. Upload all files in this package to XOOPS_URL/modules/APCal/, overwriting the existing files. -2. Log in to your site as administrator. -3. Update the module using the XOOPS module administration panel at 'System Admin Modules'. - -P.S.: Before upgrading, we recommend you to backup your database, customized templates and module files. \ No newline at end of file Added: XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt =================================================================== --- XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt (rev 0) +++ XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -0,0 +1,97 @@ +Module Name : APCal +Version Number : 2.2.0 +Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> + +Version 2.2.0 +- Fixed Timezones issue which was adding or removing days to an event. +- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. +- Updated All language files and variables to make the module clonable with SmartClone. + +Version 2.1.3 +- Fixed Events which need to be admitted don't create doubles of active events and an error message when clicked.. +- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. + +Version 2.1.2 +- Fixed When inserting a new event, pictures are saved. +- Fixed The module now comes with its own datepicker because of some Xoops version bug. +- Fixed The map displays correclty when the contact is a user from the website. + +Version 2.1.1 +- Fixed When inserting a new event, pictures are saved. +- Updated Empty fields doesn't show in the event view. + +Version 2.1.0 +- Added Online registration feature with option to turn it on/off. (Uers can subscribe to an event and receive notifications for it) (Thanks to Goffy) +- Updated New way to make thumbs for better support on every servers. (Needs GD library) +- Updated When you save an event, the redirection is where you were before (Instead of current month) +- Fixed Links on events in the map for Yearly view and List view +- Fixed Some minor bug fixes +- New features are translated in English, French and German. + +Version 2.0.4 +- Updated Spanish and German translation. +- Fixed The link to add an event from the monthly view. + +Version 2.0.3 +- Minor bug fix on events insertion. +- The box in monthly view will not expand more than the screen width and height. + +Version 2.0.2 +- Fixed Shift for events in the first week of the month. +- Updated Language of social networks buttons in module language files. +- Updated Full event summary show in monthly view to take all available space. +- Updated In event view, event summary as title. + +Version 2.0.0 +- Updated Monthly view with linear view for one event (instead of repeating over and over) +- Added Possibility to Add Pictures to an event including a separate main picture. +- Added Thumbnail pictures with viewer in event view. +- Added Seperate field for website and e-mail. +- Added Optional main picture display in Monthly View (on mouse over), List View, Daily View and Weekly View. +- Added Each category have its own color. +- Added Legend of categories with categories colors. +- Added Possibility to choose which category to be used for an event (as we keep multi-category feature). +- Added Possibility to choose different hours for the same event (if multiple days are selected). +- Updated More neutral theme colors for images, should be a better fit with most website. +- Updated Reorganisation of admin preferences. +- Added Tell a friend feature. +- Added New sharing button (LindedIn and Delicious). +- Some minor bug fixes. + +Version 1.0.6 +- Added links to social networks (Facebook, Twitter, Google+) + +Version 1.0.5 +- Updated Admin menu to fit XOOPS 2.4 and 2.5. +- Some functions updates to fit php 5.3. + +Version 1.0.4 +- Updated admin menu. +- Fixed the bug caused by the .htaccess file generating an "Internal server error". +- Some minor bug fixes. + +Version 1.0.3 +- Some minor bug fixes. + +Version 1.0.2 +- Updated Google Optimization. +- Added onUpdate action to add the new DB fields. +- Updated onInstall action. +- Added navigation menu in event view and option to enable/disable it. +- Updated option to have bigger columns for every day (Select the ones bigger). +- Updated the "share this calendar" example to fit with Internet Explorer (IE7+) + +Version 1.0.1 +- Updated URLRewriting. +- Updated Google Optimization. + +Version 1.0.0 +- Added a map showing all events location. +- Added markers with number representing the date of event with next event first. +- Added individual map showing event location. +- Added optimization for Google. +- Added possibility to add a description in HTML for each categories. +- Added an API that allows webmasters to show easily your calendar on their website (linking back to your site). +- Updated customizable theme. +- Added option for bigger columns for week-ends. +- Updated calendar of holidays for United States, Canada and France. \ No newline at end of file Added: XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt =================================================================== --- XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt (rev 0) +++ XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -0,0 +1,9 @@ +Module Name : APCal +Version Number : 2.2.0 +Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> + +INSTALL INSTRUCTIONS +1. Upload the APCal directory to XOOPS_URL/modules/ +2. Log in to your site as administrator. +3. Install the module using the XOOPS module administration panel at 'System Admin Modules'. + If you already have the piCal module, all your categories and events will be automatically transfered. \ No newline at end of file Added: XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt =================================================================== --- XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt (rev 0) +++ XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -0,0 +1,244 @@ +Module Name : APCal +Version Number : 2.2.0 +Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> + +Feel free to translate to your own language and send us your changes. + +Done for: +up to v2.1.0: English, French, German +up to v2.0.4: English, French, German, Spanish +before v1.0.0: English, French, German, Spanish, Japanese, Dutch, Russian, Tchinese, Swedish, Portuguese, BrasilPortuguese + + +Version 2.1.0 +- modinfo.php + - added _MI_APCAL_ENABLEREGISTRATION +- apcal_constants.php + - added _APCAL_RO_CANCEL + - added _APCAL_RO_RADIO_YES + - added _APCAL_RO_RADIO_NO + - added _APCAL_RO_ONLINE_POSS + - added _APCAL_RO_ONLINE_POSS_2 + - added _APCAL_RO_ONLY_MEMBERS + - added _APCAL_RO_ONLINE_NO + - added _APCAL_RO_ONLINE_YES + - added _APCAL_RO_ONLINE_ACTIVATE + - added _APCAL_RO_ONLINE_DEACTIVATE + - added _APCAL_RO_ONLINE + - added _APCAL_RO_BTN_ADD + - added _APCAL_RO_BTN_ADDMORE + - added _APCAL_RO_BTN_REMOVE + - added _APCAL_RO_ENABLE_ONLINE + - added _APCAL_RO_NOMEMBERS + - added _APCAL_RO_BTN_LISTMEMBERS + - added _APCAL_RO_SUCCESS_ADD + - added _APCAL_RO_SUCCESS_REMOVE + - added _APCAL_RO_UNAME + - added _APCAL_RO_FIRSTNAME + - added _APCAL_RO_LASTNAME + - added _APCAL_RO_EMAIL + - added _APCAL_RO_EXTRAINFO1 + - added _APCAL_RO_EXTRAINFO2 + - added _APCAL_RO_EXTRAINFO3 + - added _APCAL_RO_EXTRAINFO4 + - added _APCAL_RO_EXTRAINFO5 + - added _APCAL_RO_BTN_CONF_ADD + - added _APCAL_RO_BTN_CONF_ADD_MORE + - added _APCAL_RO_BTN_CONF_REMOVE + - added _APCAL_RO_BTN_CANCEL + - added _APCAL_RO_EVENT + - added _APCAL_RO_TITLE1 + - added _APCAL_RO_OBLIGATORY + - added _APCAL_RO_ERROR_REMOVE + - added _APCAL_RO_ERROR_ADD + - added _APCAL_RO_BTN_BACK + - added _APCAL_RO_BACK + - added _APCAL_RO_ONLINE2 + - added _APCAL_RO_ACTION + - added _APCAL_RO_TITLE2 + - added _APCAL_RO_BTN_RO_EDIT + - added _APCAL_RO_BTN_RO_DEACTIVATE + - added _APCAL_RO_BTN_RO_ACTIVATE + - added _APCAL_RO_QUANTITY + - added _APCAL_RO_QUANTITY2 + - added _APCAL_RO_DATELIMIT + - added _APCAL_RO_EMAIL_NOTIFY + - added _APCAL_RO_BTN_CONF_ACTIVATE + - added _APCAL_RO_ERROR_RO_ACTIVATE + - added _APCAL_RO_SUCCESS_RO_ACTIVATE + - added _APCAL_RO_ERROR_RO_DEACTIVATE + - added _APCAL_RO_SUCCESS_RO_DEACTIVATE + - added _APCAL_RO_ERROR_FULL + - added _APCAL_RO_ERROR_TIMEOUT + - added _APCAL_RO_ERROR_OBLIGATORY + - added _APCAL_RO_BTN_CONF_SAVE + - added _APCAL_RO_BTN_CONF_EDIT + - added _APCAL_RO_MAIL_SUBJ_ADD + - added _APCAL_RO_MAIL_SUBJ_REMOVE + - added _APCAL_RO_MAIL_SUBJ_TEXT + - added _APCAL_RO_DATE + - added _APCAL_RO_LOCATION + - added _APCAL_RO_LINK + - added _APCAL_RO_TITLE3 + - added _APCAL_RO_TITLE4 + - added _APCAL_RO_MAIL_SENDER + - added _APCAL_RO_MAIL_SUBJ + - added _APCAL_RO_MAIL_BODY1 + - added _APCAL_RO_MAIL_BODY2 + - added _APCAL_RO_BTN_SEND + - added _APCAL_RO_MAILSENT + - added _APCAL_RO_TITLE5 + - added _APCAL_RO_BTN_EDIT + - added _APCAL_RO_SUCCESS_EDIT + - added _APCAL_RO_ERROR_EDIT + - added _APCAL_RO_SEND_CONF1 + - added _APCAL_RO_SEND_CONF2 + - added _APCAL_RO_SEND_CONF3 + - added _APCAL_RO_REDIRECT + - added _APCAL_RO_SUCCESS_NEW_EVENT + - added _APCAL_RO_SUCCESS_DELETE_EVENT + - added _APCAL_RO_SUCCESS_UPDATE_EVENT + - added _APCAL_RO_SUCCESS_COPY_EVENT + +Version 2.0.4 +- main.php + - added _APCAL_FB_LNG + - added _APCAL_GPLUS_LNG + +Version 2.0.0 +- modinfo.php + - updated _MI_APCAL_DISPLAYCATTITLE + - added _MI_APCAL_ENABLESOCIAL + - added _MI_APCAL_NBPICS + - added _MI_APCAL_PICSWIDTH + - added _MI_APCAL_PICSHEIGHT + - added _MI_APCAL_SHOWPICMONTHLY + - added _MI_AP... [truncated message content] |